usb: dwc3: Kconfig: get rid of obsolete mode selection

The mode selection for the DWC3 is kind of obsolete. The driver does not
have to be host only or gadget only. This choice is confusing.
All the remaining callers of dwc3_uboot_init() explicitly set dr_mode
before calling the function, so none rely on a default behavior.

Remove the choice menu and keep only the USB_DWC3_GADGET option. Enable it
by default if USB_GADGET and USB_DWC3 are enabled.
It must be disabled for the evb-rk3328 as it uses DWC2 for the gadget and
DWC3 for the host.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
index 37610774c191fc16988692a3861bb2d8c29912b9..f161c40ae76961664b8d63ad31eb67696508eebc 100644 (file)
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -86,6 +86,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207

diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
index abd945a975d6d98893ba43e4957449db843578a2..1caa39132048d0848f333355cccb938518a1ae9b 100644 (file)
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -44,6 +44,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
 CONFIG_USB_DWC3_MESON_G12A=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e

diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig
index 3ab0af115875134026c3a30a10158c6659c08747..60a0d1473c186b32404340120c908746bfea585e 100644 (file)
--- a/configs/rock64-rk3328_defconfig
+++ b/configs/rock64-rk3328_defconfig
@@ -88,6 +88,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
 CONFIG_USB_GADGET_VENDOR_NUM=0x2207

diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig
index 9df04c345d6083e376cd3e6c2cc303eaac5c746e..302480efef2225fc1cdd72cb54f3f0c53eba7a52 100644 (file)
--- a/configs/sei510_defconfig
+++ b/configs/sei510_defconfig
@@ -65,6 +65,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
 CONFIG_USB_DWC3_MESON_G12A=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VENDOR_NUM=0x18d1

diff --git a/configs/u200_defconfig b/configs/u200_defconfig
index ced6ca84b60f3ec0c7f222a1917928254d6d377f..009d564d6adae4ad6a3982710e5f6b6e31363c0c 100644 (file)
--- a/configs/u200_defconfig
+++ b/configs/u200_defconfig
@@ -44,6 +44,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
 CONFIG_USB_DWC3_MESON_G12A=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 25e1a38aee08fbb87a96dddeb733b11553fc6b5e..c302486291f429ee83137cd5bf2c89b351390dc5 100644 (file)
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -7,25 +7,11 @@ config USB_DWC3
 
 if USB_DWC3
 
-choice
-       bool "DWC3 Mode Selection"
-
-config USB_DWC3_HOST
-       bool "Host only mode"
-       depends on USB
-       help
-         Select this when you want to use DWC3 in host mode only,
-         thereby the gadget feature will be regressed.
-
 config USB_DWC3_GADGET
-       bool "Gadget only mode"
+       bool "USB Gadget support for DWC3"
+       default y
        depends on USB_GADGET
        select USB_GADGET_DUALSPEED
-       help
-         Select this when you want to use DWC3 in gadget mode only,
-         thereby the host feature will be regressed.
-
-endchoice
 
 comment "Platform Glue Driver Support"
 

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 5fe5bfae0ed05b88cbc0ccd7eb73e8cc86f25baf..23af60c98d34680b9f8e4787841da73dd7d69a09 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -707,9 +707,9 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev)
                return -ENOMEM;
        }
 
-       if (IS_ENABLED(CONFIG_USB_DWC3_HOST))
+       if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET))
                dwc->dr_mode = USB_DR_MODE_HOST;
-       else if (IS_ENABLED(CONFIG_USB_DWC3_GADGET))
+       else if (!IS_ENABLED(CONFIG_USB_HOST))
                dwc->dr_mode = USB_DR_MODE_PERIPHERAL;
 
        if (dwc->dr_mode == USB_DR_MODE_UNKNOWN)