Commit d5a8ab40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some USB and PHY fixes for 4.2-rc6 that resolve some reported
  issues.

  All of these have been in the linux-next tree for a while, full
  details on the patches are in the shortlog below"

* tag 'usb-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  ARM: dts: dra7: Add syscon-pllreset syscon to SATA PHY
  drivers/usb: Delete XHCI command timer if necessary
  xhci: fix off by one error in TRB DMA address boundary check
  usb: udc: core: add device_del() call to error pathway
  phy: ti-pipe3: i783 workaround for SATA lockup after dpll unlock/relock
  phy-sun4i-usb: Add missing EXPORT_SYMBOL_GPL for sun4i_usb_phy_set_squelch_detect
  USB: sierra: add 1199:68AB device ID
  usb: gadget: f_printer: actually limit the number of instances
  usb: gadget: f_hid: actually limit the number of instances
  usb: gadget: f_uac2: fix calculation of uac2->p_interval
  usb: gadget: bdc: fix a driver crash on disconnect
  usb: chipidea: ehci_init_driver is intended to call one time
  USB: qcserial: Add support for Dell Wireless 5809e 4G Modem
  USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355
parents 9f21a8bd 0a1b6f63

Documentation/devicetree/bindings/phy/ti-phy.txt

+16 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ Optional properties: 
 - id: If there are multiple instance of the same type, in order to

   differentiate between each instance "id" can be used (e.g., multi-lane PCIe

   PHY). If "id" is not provided, it is set to default value of '1'.

 - syscon-pllreset: Handle to system control region that contains the

   CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0

   register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.



This is usually a subnode of ocp2scp to which it is connected.
@@ -100,3 +103,16 @@ usb3phy@4a084400 { 
			"sysclk",

			"refclk";

};



sata_phy: phy@4A096000 {

	compatible = "ti,phy-pipe3-sata";

	reg = <0x4A096000 0x80>, /* phy_rx */

	      <0x4A096400 0x64>, /* phy_tx */

	      <0x4A096800 0x40>; /* pll_ctrl */

	reg-names = "phy_rx", "phy_tx", "pll_ctrl";

	ctrl-module = <&omap_control_sata>;

	clocks = <&sys_clkin1>, <&sata_ref_clk>;

	clock-names = "sysclk", "refclk";

	syscon-pllreset = <&scm_conf 0x3fc>;

	#phy-cells = <0>;

};

arch/arm/boot/dts/dra7.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,7 @@ 
				ctrl-module = <&omap_control_sata>;

				clocks = <&sys_clkin1>, <&sata_ref_clk>;

				clock-names = "sysclk", "refclk";

				syscon-pllreset = <&scm_conf 0x3fc>;

				#phy-cells = <0>;

			};

drivers/phy/phy-sun4i-usb.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled) 


	sun4i_usb_phy_write(phy, PHY_SQUELCH_DETECT, enabled ? 0 : 2, 2);

}

EXPORT_SYMBOL_GPL(sun4i_usb_phy_set_squelch_detect);



static struct phy_ops sun4i_usb_phy_ops = {

	.init		= sun4i_usb_phy_init,

drivers/phy/phy-ti-pipe3.c

+55 −6
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/delay.h>

#include <linux/phy/omap_control_phy.h>

#include <linux/of_platform.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>



#define	PLL_STATUS		0x00000004

#define	PLL_GO			0x00000008
@@ -52,6 +54,8 @@ 
#define	PLL_LOCK		0x2

#define	PLL_IDLE		0x1



#define SATA_PLL_SOFT_RESET	BIT(18)



/*

 * This is an Empirical value that works, need to confirm the actual

 * value required for the PIPE3PHY_PLL_CONFIGURATION2.PLL_IDLE status
@@ -82,6 +86,9 @@ struct ti_pipe3 { 
	struct clk		*refclk;

	struct clk		*div_clk;

	struct pipe3_dpll_map	*dpll_map;

	struct regmap		*dpll_reset_syscon; /* ctrl. reg. acces */

	unsigned int		dpll_reset_reg; /* reg. index within syscon */

	bool			sata_refclk_enabled;

};



static struct pipe3_dpll_map dpll_map_usb[] = {
@@ -249,8 +256,11 @@ static int ti_pipe3_exit(struct phy *x) 
	u32 val;

	unsigned long timeout;



	/* SATA DPLL can't be powered down due to Errata i783 */

	if (of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata"))

	/* If dpll_reset_syscon is not present we wont power down SATA DPLL

	 * due to Errata i783

	 */

	if (of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata") &&

	    !phy->dpll_reset_syscon)

		return 0;



	/* PCIe doesn't have internal DPLL */
@@ -276,6 +286,14 @@ static int ti_pipe3_exit(struct phy *x) 
		}

	}



	/* i783: SATA needs control bit toggle after PLL unlock */

	if (of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata")) {

		regmap_update_bits(phy->dpll_reset_syscon, phy->dpll_reset_reg,

				   SATA_PLL_SOFT_RESET, SATA_PLL_SOFT_RESET);

		regmap_update_bits(phy->dpll_reset_syscon, phy->dpll_reset_reg,

				   SATA_PLL_SOFT_RESET, 0);

	}



	ti_pipe3_disable_clocks(phy);



	return 0;
@@ -350,6 +368,21 @@ static int ti_pipe3_probe(struct platform_device *pdev) 
		}

	} else {

		phy->wkupclk = ERR_PTR(-ENODEV);

		phy->dpll_reset_syscon = syscon_regmap_lookup_by_phandle(node,

							"syscon-pllreset");

		if (IS_ERR(phy->dpll_reset_syscon)) {

			dev_info(&pdev->dev,

				 "can't get syscon-pllreset, sata dpll won't idle\n");

			phy->dpll_reset_syscon = NULL;

		} else {

			if (of_property_read_u32_index(node,

						       "syscon-pllreset", 1,

						       &phy->dpll_reset_reg)) {

				dev_err(&pdev->dev,

					"couldn't get pllreset reg. offset\n");

				return -EINVAL;

			}

		}

	}



	if (of_device_is_compatible(node, "ti,phy-pipe3-pcie")) {
@@ -402,10 +435,16 @@ static int ti_pipe3_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, phy);

	pm_runtime_enable(phy->dev);

	/* Prevent auto-disable of refclk for SATA PHY due to Errata i783 */

	if (of_device_is_compatible(node, "ti,phy-pipe3-sata"))

		if (!IS_ERR(phy->refclk))



	/*

	 * Prevent auto-disable of refclk for SATA PHY due to Errata i783

	 */

	if (of_device_is_compatible(node, "ti,phy-pipe3-sata")) {

		if (!IS_ERR(phy->refclk)) {

			clk_prepare_enable(phy->refclk);

			phy->sata_refclk_enabled = true;

		}

	}



	generic_phy = devm_phy_create(phy->dev, NULL, &ops);

	if (IS_ERR(generic_phy))
@@ -472,8 +511,18 @@ static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy) 
{

	if (!IS_ERR(phy->wkupclk))

		clk_disable_unprepare(phy->wkupclk);

	if (!IS_ERR(phy->refclk))

	if (!IS_ERR(phy->refclk)) {

		clk_disable_unprepare(phy->refclk);

		/*

		 * SATA refclk needs an additional disable as we left it

		 * on in probe to avoid Errata i783

		 */

		if (phy->sata_refclk_enabled) {

			clk_disable_unprepare(phy->refclk);

			phy->sata_refclk_enabled = false;

		}

	}



	if (!IS_ERR(phy->div_clk))

		clk_disable_unprepare(phy->div_clk);

}

drivers/usb/chipidea/core.c

+12 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,18 @@ static struct platform_driver ci_hdrc_driver = { 
	},

};



module_platform_driver(ci_hdrc_driver);

static int __init ci_hdrc_platform_register(void)

{

	ci_hdrc_host_driver_init();

	return platform_driver_register(&ci_hdrc_driver);

}

module_init(ci_hdrc_platform_register);



static void __exit ci_hdrc_platform_unregister(void)

{

	platform_driver_unregister(&ci_hdrc_driver);

}

module_exit(ci_hdrc_platform_unregister);



MODULE_ALIAS("platform:ci_hdrc");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE