Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68dc08b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / PHY driver fixes from Greg KH:
 "Here are two small sets of patches, both from subsystem trees, USB
  gadget and PHY drivers.

  Full details are in the shortlog, and they have all been in linux-next
  for a while (before I merged them to the USB tree)"

* tag 'usb-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: f_fs: Fix use-after-free
  usb: dwc3: gadget: Fix suspend/resume during device mode
  usb: dwc3: fix memory leak of dwc->regset
  usb: dwc3: core: fix PHY handling during suspend
  usb: dwc3: omap: fix up error path on probe()
  usb: gadget: composite: Clear reserved fields of SSP Dev Cap
  phy: rockchip-emmc: adapt binding to specifiy register offset and length
  phy: rockchip-emmc: should be a child device of the GRF
  phy: rockchip-dp: should be a child device of the GRF
parents 8e3ae37a d40d3347

Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt

+11 −7
Original line number Original line Diff line number Diff line
@@ -8,15 +8,19 @@ Required properties: 
	of memory mapped region.

	of memory mapped region.

- clock-names: from common clock binding:

- clock-names: from common clock binding:

	Required elements: "24m"

	Required elements: "24m"

- rockchip,grf: phandle to the syscon managing the "general register files"

- #phy-cells : from the generic PHY bindings, must be 0;

- #phy-cells : from the generic PHY bindings, must be 0;





Example:

Example:





grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	edp_phy: edp-phy {

	edp_phy: edp-phy {

		compatible = "rockchip,rk3288-dp-phy";

		compatible = "rockchip,rk3288-dp-phy";

	rockchip,grf = <&grf>;

		clocks = <&cru SCLK_EDP_24M>;

		clocks = <&cru SCLK_EDP_24M>;

		clock-names = "24m";

		clock-names = "24m";

		#phy-cells = <0>;

		#phy-cells = <0>;

	};

	};

};

Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt

+14 −8
Original line number Original line Diff line number Diff line
@@ -3,17 +3,23 @@ Rockchip EMMC PHY 




Required properties:

Required properties:

 - compatible: rockchip,rk3399-emmc-phy

 - compatible: rockchip,rk3399-emmc-phy

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #phy-cells: must be 0

 - #phy-cells: must be 0

 - reg: PHY configure reg address offset in "general

 - reg: PHY register address offset and length in "general

   register files"

   register files"





Example:

Example:





emmcphy: phy {



grf: syscon@ff770000 {

	compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";

	#address-cells = <1>;

	#size-cells = <1>;



...



	emmcphy: phy@f780 {

		compatible = "rockchip,rk3399-emmc-phy";

		compatible = "rockchip,rk3399-emmc-phy";

	rockchip,grf = <&grf>;

		reg = <0xf780 0x20>;

	reg = <0xf780>;

		#phy-cells = <0>;

		#phy-cells = <0>;

	};

	};

};

drivers/phy/phy-rockchip-dp.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -86,6 +86,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev) 
	if (!np)

	if (!np)

		return -ENODEV;

		return -ENODEV;





	if (!dev->parent || !dev->parent->of_node)

		return -ENODEV;



	dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);

	dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);

	if (IS_ERR(dp))

	if (IS_ERR(dp))

		return -ENOMEM;

		return -ENOMEM;
@@ -104,9 +107,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev) 
		return ret;

		return ret;

	}

	}





	dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");

	dp->grf = syscon_node_to_regmap(dev->parent->of_node);

	if (IS_ERR(dp->grf)) {

	if (IS_ERR(dp->grf)) {

		dev_err(dev, "rk3288-dp needs rockchip,grf property\n");

		dev_err(dev, "rk3288-dp needs the General Register Files syscon\n");

		return PTR_ERR(dp->grf);

		return PTR_ERR(dp->grf);

	}

	}

drivers/phy/phy-rockchip-emmc.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,10 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev) 
	struct regmap *grf;

	struct regmap *grf;

	unsigned int reg_offset;

	unsigned int reg_offset;





	grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf");

	if (!dev->parent || !dev->parent->of_node)

		return -ENODEV;



	grf = syscon_node_to_regmap(dev->parent->of_node);

	if (IS_ERR(grf)) {

	if (IS_ERR(grf)) {

		dev_err(dev, "Missing rockchip,grf property\n");

		dev_err(dev, "Missing rockchip,grf property\n");

		return PTR_ERR(grf);

		return PTR_ERR(grf);

drivers/usb/dwc3/core.c

+22 −1
Original line number Original line Diff line number Diff line
@@ -1150,6 +1150,11 @@ static int dwc3_suspend(struct device *dev) 
	phy_exit(dwc->usb2_generic_phy);

	phy_exit(dwc->usb2_generic_phy);

	phy_exit(dwc->usb3_generic_phy);

	phy_exit(dwc->usb3_generic_phy);





	usb_phy_set_suspend(dwc->usb2_phy, 1);

	usb_phy_set_suspend(dwc->usb3_phy, 1);

	WARN_ON(phy_power_off(dwc->usb2_generic_phy) < 0);

	WARN_ON(phy_power_off(dwc->usb3_generic_phy) < 0);



	pinctrl_pm_select_sleep_state(dev);

	pinctrl_pm_select_sleep_state(dev);





	return 0;

	return 0;
@@ -1163,11 +1168,21 @@ static int dwc3_resume(struct device *dev) 




	pinctrl_pm_select_default_state(dev);

	pinctrl_pm_select_default_state(dev);





	usb_phy_set_suspend(dwc->usb2_phy, 0);

	usb_phy_set_suspend(dwc->usb3_phy, 0);

	ret = phy_power_on(dwc->usb2_generic_phy);

	if (ret < 0)

		return ret;



	ret = phy_power_on(dwc->usb3_generic_phy);

	if (ret < 0)

		goto err_usb2phy_power;



	usb_phy_init(dwc->usb3_phy);

	usb_phy_init(dwc->usb3_phy);

	usb_phy_init(dwc->usb2_phy);

	usb_phy_init(dwc->usb2_phy);

	ret = phy_init(dwc->usb2_generic_phy);

	ret = phy_init(dwc->usb2_generic_phy);

	if (ret < 0)

	if (ret < 0)

		return ret;

		goto err_usb3phy_power;





	ret = phy_init(dwc->usb3_generic_phy);

	ret = phy_init(dwc->usb3_generic_phy);

	if (ret < 0)

	if (ret < 0)
@@ -1200,6 +1215,12 @@ static int dwc3_resume(struct device *dev) 
err_usb2phy_init:

err_usb2phy_init:

	phy_exit(dwc->usb2_generic_phy);

	phy_exit(dwc->usb2_generic_phy);





err_usb3phy_power:

	phy_power_off(dwc->usb3_generic_phy);



err_usb2phy_power:

	phy_power_off(dwc->usb2_generic_phy);



	return ret;

	return ret;

}

}