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>
This commit is contained in:
Ezequiel Garcia 2013-12-22 00:08:33 -03:00 committed by Felipe Balbi
parent 12c8d64e29
commit 845c071b78
2 changed files with 6 additions and 6 deletions

View file

@ -94,8 +94,6 @@ source "drivers/usb/wusbcore/Kconfig"
source "drivers/usb/host/Kconfig" source "drivers/usb/host/Kconfig"
source "drivers/usb/musb/Kconfig"
source "drivers/usb/renesas_usbhs/Kconfig" source "drivers/usb/renesas_usbhs/Kconfig"
source "drivers/usb/class/Kconfig" source "drivers/usb/class/Kconfig"
@ -106,6 +104,8 @@ source "drivers/usb/image/Kconfig"
endif endif
source "drivers/usb/musb/Kconfig"
source "drivers/usb/dwc3/Kconfig" source "drivers/usb/dwc3/Kconfig"
source "drivers/usb/chipidea/Kconfig" source "drivers/usb/chipidea/Kconfig"

View file

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