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

Commit 35e1c9ee authored by Jack Pham's avatar Jack Pham
Browse files

usb: phy: qmp: Remove ext-vbus-id property 



The QMP SSPHY will always be used in configurations
where VBUS and ID detection are handled externally,
so remove this device tree property as there is no
need to distinguish it.

Change-Id: I9cf391f0e4606369a7103134fa4bceefb7d9955a
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 7b8f4dfc

Documentation/devicetree/bindings/usb/msm-phy.txt

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ Optional properties: 
 - qcom,vbus-valid-override: If present, indicates VBUS pin is not connected to

   the USB PHY and the controller must rely on external VBUS notification in

   order to manually relay the notification to the SSPHY.

 - qcom,ext-vbus-id: If present, indicates that the PHY does not handle VBUS and ID changes.

 - qcom,no-pipe-clk-switch: If present, indicates that the pipe_clk does not need

   to switch sources between the XO and the PHY PIPE clock output.

drivers/usb/phy/phy-msm-ssusb-qmp.c

+1 −6
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ struct msm_ssphy_qmp { 
	bool			clk_enabled;

	bool			cable_connected;

	bool			in_suspend;

	bool			ext_vbus_id;

	bool			override_pll_cal;

	bool			switch_pipe_clk_src;

};
@@ -533,8 +532,7 @@ static int msm_ssphy_power_enable(struct msm_ssphy_qmp *phy, bool on) 
	 * Turn off the phy's LDOs when cable is disconnected for device mode

	 * with external vbus_id indication.

	 */

	if (!host && !chg_connected && phy->ext_vbus_id &&

		!phy->cable_connected) {

	if (!host && !chg_connected && !phy->cable_connected) {

		if (on) {

			ret = regulator_enable(phy->vdd);

			if (ret)
@@ -677,9 +675,6 @@ static int msm_ssphy_qmp_probe(struct platform_device *pdev) 
		return ret;

	}



	phy->ext_vbus_id =

		of_property_read_bool(dev->of_node, "qcom,ext-vbus-id");



	phy->vdd = devm_regulator_get(dev, "vdd");

	if (IS_ERR(phy->vdd)) {

		dev_err(dev, "unable to get vdd supply\n");