|
@@ -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->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->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->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->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) {
|