[PATCH] usb: dwc3: core: configure PHY before initializing host in dwc3_set_mode

[Sven Peter]

Usually, first the PHY is set to the correct mode and then the host or
device side of the controller is initialized afterwards. Otherwise a PHY
that's already used has to be reconfigured.
dwc3_core_init_mode() does this correctly for both host and device and
__dwc3_set_mode() does it correctly when switching to device mode.
When setting up host mode however it first initializes xhci and only
then changes the PHY's mode. Let's also do the operations in the correct
order here.

Fixes: 958d1a4c40dd ("usb: dwc3: core: program PHY for proper DRD modes")
Signed-off-by: Sven Peter <sven@xxxxxxxxxxxxx>
---
 drivers/usb/dwc3/core.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index ad4d644e21a4..759d23d908fa 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -212,14 +212,15 @@ static void __dwc3_set_mode(struct work_struct *work)
 
 	switch (dwc->desired_dr_role) {
 	case DWC3_GCTL_PRTCAP_HOST:
+		if (dwc->usb2_phy)
+			otg_set_vbus(dwc->usb2_phy->otg, true);
+		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) {
 			dev_err(dwc->dev, "failed to initialize host\n");
 		} else {
-			if (dwc->usb2_phy)
-				otg_set_vbus(dwc->usb2_phy->otg, true);
-			phy_set_mode(dwc->usb2_generic_phy, PHY_MODE_USB_HOST);
-			phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST);
 			if (dwc->dis_split_quirk) {
 				reg = dwc3_readl(dwc->regs, DWC3_GUCTL3);
 				reg |= DWC3_GUCTL3_SPLITDISABLE;
-- 
2.25.1