rk32: ehci: work-around for abnormal ohci

[firefly-linux-kernel-4.4.55.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 48f1781352f154e9820eda618696c9e3d486c0af..18c9c085a7afd09fd728e2ff643b993d35e53895 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -2,6 +2,16 @@
 # USB device configuration
 #
 
+# These are unused now, remove them once they are no longer selected
+config USB_ARCH_HAS_OHCI
+       bool
+
+config USB_ARCH_HAS_EHCI
+       bool
+
+config USB_ARCH_HAS_XHCI
+       bool
+
 menuconfig USB_SUPPORT
        bool "USB support"
        depends on HAS_IOMEM
@@ -12,64 +22,13 @@ menuconfig USB_SUPPORT
 
 if USB_SUPPORT
 
-# Host-side USB depends on having a host controller
-# NOTE:  dummy_hcd is always an option, but it's ignored here ...
-# NOTE:  SL-811 option should be board-specific ...
+config USB_COMMON
+       tristate
+       default y
+       depends on USB || USB_GADGET
+
 config USB_ARCH_HAS_HCD
-       boolean
-       default y if USB_ARCH_HAS_OHCI
-       default y if USB_ARCH_HAS_EHCI
-       default y if PCMCIA && !M32R                    # sl811_cs
-       default y if ARM                                # SL-811
-       default y if BLACKFIN                           # SL-811
-       default y if SUPERH                             # r8a66597-hcd
-       default PCI
-
-# many non-PCI SOC chips embed OHCI
-config USB_ARCH_HAS_OHCI
-       boolean
-       # ARM:
-       default y if SA1111
-       default y if ARCH_OMAP
-       default y if ARCH_S3C2410
-       default y if PXA27x
-       default y if PXA3xx
-       default y if ARCH_EP93XX
-       default y if ARCH_AT91
-       default y if ARCH_PNX4008 && I2C
-       default y if MFD_TC6393XB
-       default y if ARCH_W90X900
-       default y if ARCH_DAVINCI_DA8XX
-       default y if ARCH_CNS3XXX
-       default y if PLAT_SPEAR
-       # PPC:
-       default y if STB03xxx
-       default y if PPC_MPC52xx
-       # MIPS:
-       default y if MIPS_ALCHEMY
-       default y if MACH_JZ4740
-       # more:
-       default PCI
-
-# some non-PCI hcds implement EHCI
-config USB_ARCH_HAS_EHCI
-       boolean
-       default y if PPC_83xx
-       default y if PPC_MPC512x
-       default y if SOC_AU1200
-       default y if ARCH_IXP4XX
-       default y if ARCH_W90X900
-       default y if ARCH_AT91SAM9G45
-       default y if ARCH_MXC
-       default y if ARCH_OMAP3
-       default y if ARCH_CNS3XXX
-       default y if ARCH_VT8500
-       default y if PLAT_SPEAR
-       default y if PLAT_S5P
-       default y if ARCH_MSM
-       default y if MICROBLAZE
-       default y if SPARC_LEON
-       default PCI
+       def_bool y
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
@@ -108,6 +67,8 @@ config USB
          To compile this driver as a module, choose M here: the
          module will be called usbcore.
 
+if USB
+
 source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/mon/Kconfig"
@@ -126,12 +87,19 @@ source "drivers/usb/storage/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
+endif
+
+source "drivers/usb/dwc3/Kconfig"
+
+source "drivers/usb/chipidea/Kconfig"
+
 comment "USB port drivers"
-       depends on USB
+
+if USB
 
 config USB_USS720
        tristate "USS720 parport driver"
-       depends on USB && PARPORT
+       depends on PARPORT
        select PARPORT_NOT_PC
        ---help---
          This driver is for USB parallel port adapters that use the Lucent
@@ -164,8 +132,12 @@ source "drivers/usb/misc/Kconfig"
 
 source "drivers/usb/atm/Kconfig"
 
+endif # USB
+
+source "drivers/usb/phy/Kconfig"
+
 source "drivers/usb/gadget/Kconfig"
 
-source "drivers/usb/otg/Kconfig"
+source "drivers/usb/dwc_otg_310/Kconfig"
 
 endif # USB_SUPPORT