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

Commit 644cbbc3 authored by Manu Gautam's avatar Manu Gautam Committed by Felipe Balbi
Browse files

usb: dwc3: core: Notify current USB mode to USB3 PHY as well 



Driver currently notifies only USB2 PHY on USB mode change.
Extend this to USB3 PHY so that PHY drivers based on the
mode can release system resources - clocks, regulators etc.
Additionally Qualcomm QMP and QUSB2 PHY drivers need to
override VBUS signal in PHY wrapper in device mode as USB
VBUS line is not connected to PHYs. Also, remove NULL checks
for PHY when calling phy_set_mode as PHY ops already check this.

Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 8eed00b2

drivers/usb/dwc3/core.c

+8 −9
Original line number Diff line number Diff line
@@ -156,9 +156,8 @@ static void __dwc3_set_mode(struct work_struct *work) 
		} else {

			if (dwc->usb2_phy)

				otg_set_vbus(dwc->usb2_phy->otg, true);

			if (dwc->usb2_generic_phy)

			phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);



			phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);

		}

		break;

	case DWC3_GCTL_PRTCAP_DEVICE:
@@ -166,8 +165,8 @@ static void __dwc3_set_mode(struct work_struct *work) 


		if (dwc->usb2_phy)

			otg_set_vbus(dwc->usb2_phy->otg, false);

		if (dwc->usb2_generic_phy)

		phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);

		phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE);



		ret = dwc3_gadget_init(dwc);

		if (ret)
@@ -932,8 +931,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 


		if (dwc->usb2_phy)

			otg_set_vbus(dwc->usb2_phy->otg, false);

		if (dwc->usb2_generic_phy)

		phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_DEVICE);

		phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE);



		ret = dwc3_gadget_init(dwc);

		if (ret) {
@@ -948,8 +947,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) 


		if (dwc->usb2_phy)

			otg_set_vbus(dwc->usb2_phy->otg, true);

		if (dwc->usb2_generic_phy)

		phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);

		phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);



		ret = dwc3_host_init(dwc);

		if (ret) {