usb: musb: Rework USB and USB_GADGET dependency

This USB controller can work in as host-only, gadget-only or dual-role
modes. Rework the dependency on the USB and USB_GADGET configs in order
to allow building the driver when !USB or !USG_GADGET.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 2642b8a11e05f25c760ef84343d3dd7c17bb0390..a34fb9846417cff4966fa5fb9b6ab5bea5f7da48 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -94,8 +94,6 @@ source "drivers/usb/wusbcore/Kconfig"
 
 source "drivers/usb/host/Kconfig"
 
-source "drivers/usb/musb/Kconfig"
-
 source "drivers/usb/renesas_usbhs/Kconfig"
 
 source "drivers/usb/class/Kconfig"
@@ -106,6 +104,8 @@ source "drivers/usb/image/Kconfig"
 
 endif
 
+source "drivers/usb/musb/Kconfig"
+
 source "drivers/usb/dwc3/Kconfig"
 
 source "drivers/usb/chipidea/Kconfig"

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 14d7e725c2ffcde5686dc91926860f4833d8a42e..688dc8bb192dce102caa1f481c3043bd03783019 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -6,7 +6,7 @@
 # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
 config USB_MUSB_HDRC
        tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
-       depends on USB_GADGET
+       depends on (USB || USB_GADGET)
        help
          Say Y here if your system has a dual role high speed USB
          controller based on the Mentor Graphics silicon IP.  Then
@@ -35,21 +35,21 @@ choice
 
 config USB_MUSB_HOST
        bool "Host only mode"
-       depends on USB
+       depends on USB=y || USB=USB_MUSB_HDRC
        help
          Select this when you want to use MUSB in host mode only,
          thereby the gadget feature will be regressed.
 
 config USB_MUSB_GADGET
        bool "Gadget only mode"
-       depends on USB_GADGET
+       depends on USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC
        help
          Select this when you want to use MUSB in gadget mode only,
          thereby the host feature will be regressed.
 
 config USB_MUSB_DUAL_ROLE
        bool "Dual Role mode"
-       depends on (USB && USB_GADGET)
+       depends on ((USB=y || USB=USB_MUSB_HDRC) && (USB_GADGET=y || USB_GADGET=USB_MUSB_HDRC))
        help
          This is the default mode of working of MUSB controller where
          both host and gadget features are enabled.