From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Date: Mon, 30 Mar 2020 00:10:05 +0000 (-0700)
Subject: usb: dwc3: core: Use role-switch default dr_mode
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bb14308a86970a2321ac7d0e28ea0f1f1e744b0;p=linux.git

usb: dwc3: core: Use role-switch default dr_mode

If the driver is configured to use DRD role-switch, let the drd code
path decide the default dr_mode.

Signed-off-by: Thinh Nguyen <thinhn@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
---

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7046c681fece7..ab6323b8e3235 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -85,6 +85,8 @@ static int dwc3_get_dr_mode(struct dwc3 *dwc)
 		 * specified or set to OTG, then set the mode to peripheral.
 		 */
 		if (mode == USB_DR_MODE_OTG &&
+		    (!IS_ENABLED(CONFIG_USB_ROLE_SWITCH) ||
+		     !device_property_read_bool(dwc->dev, "usb-role-switch")) &&
 		    dwc->revision >= DWC3_REVISION_330A)
 			mode = USB_DR_MODE_PERIPHERAL;
 	}