1 files changed, 31 insertions, 46 deletions

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 341a37a469bd..4cbb7e4b368d 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -12,6 +12,7 @@ config USB_MUSB_HDRC
         depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523))
         select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
         select TWL4030_USB if MACH_OMAP_3430SDP
+        select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
         select USB_OTG_UTILS
         tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
         help
@@ -30,57 +31,41 @@ config USB_MUSB_HDRC
           If you do not know what this is, please say N.
 
           To compile this driver as a module, choose M here; the
-          module will be called "musb_hdrc".
+          module will be called "musb-hdrc".
 
-config USB_MUSB_SOC
-        boolean
+choice
+        prompt "Platform Glue Layer"
         depends on USB_MUSB_HDRC
-        default y if ARCH_DAVINCI
-        default y if ARCH_OMAP2430
-        default y if ARCH_OMAP3
-        default y if ARCH_OMAP4
-        default y if (BF54x && !BF544)
-        default y if (BF52x && !BF522 && !BF523)
 
-comment "DaVinci 35x and 644x USB support"
-        depends on USB_MUSB_HDRC && ARCH_DAVINCI_DMx
+config USB_MUSB_DAVINCI
+        bool "DaVinci"
+        depends on ARCH_DAVINCI_DMx
 
-comment "DA8xx/OMAP-L1x USB support"
-        depends on USB_MUSB_HDRC && ARCH_DAVINCI_DA8XX
+config USB_MUSB_DA8XX
+        bool "DA8xx/OMAP-L1x"
+        depends on ARCH_DAVINCI_DA8XX
 
-comment "OMAP 243x high speed USB support"
-        depends on USB_MUSB_HDRC && ARCH_OMAP2430
+config USB_MUSB_TUSB6010
+        bool "TUSB6010"
+        depends on ARCH_OMAP
 
-comment "OMAP 343x high speed USB support"
-        depends on USB_MUSB_HDRC && ARCH_OMAP3
+config USB_MUSB_OMAP2PLUS
+        bool "OMAP2430 and onwards"
+        depends on ARCH_OMAP2PLUS
 
-comment "OMAP 44xx high speed USB support"
-        depends on USB_MUSB_HDRC && ARCH_OMAP4
+config USB_MUSB_AM35X
+        bool "AM35x"
+        depends on ARCH_OMAP
 
-comment "Blackfin high speed USB Support"
-        depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
+config USB_MUSB_BLACKFIN
+        bool "Blackfin"
+        depends on (BF54x && !BF544) || (BF52x && ! BF522 && !BF523)
 
-config USB_MUSB_AM35X
-        bool
-        depends on USB_MUSB_HDRC && !ARCH_OMAP2430 && !ARCH_OMAP4
-        select NOP_USB_XCEIV
-        default MACH_OMAP3517EVM
-        help
-          Select this option if your platform is based on AM35x. As
-          AM35x has an updated MUSB with CPPI4.1 DMA so this config
-          is introduced to differentiate musb ip between OMAP3x and
-          AM35x platforms.
-
-config USB_TUSB6010
-        boolean "TUSB 6010 support"
-        depends on USB_MUSB_HDRC && !USB_MUSB_SOC
-        select NOP_USB_XCEIV
-        default y
-        help
-          The TUSB 6010 chip, from Texas Instruments, connects a discrete
-          HDRC core using a 16-bit parallel bus (NOR flash style) or VLYNQ
-          (a high speed serial link).  It can use system-specific external
-          DMA controllers.
+config USB_MUSB_UX500
+        bool "U8500 and U5500"
+        depends on (ARCH_U8500 && AB8500_USB) || (ARCH_U5500)
+
+endchoice
 
 choice
         prompt "Driver Mode"
@@ -158,7 +143,7 @@ config USB_MUSB_HDRC_HCD
 config MUSB_PIO_ONLY
         bool 'Disable DMA (always use PIO)'
         depends on USB_MUSB_HDRC
-        default USB_TUSB6010 || ARCH_DAVINCI_DA8XX || USB_MUSB_AM35X
+        default USB_MUSB_TUSB6010 || USB_MUSB_DA8XX || USB_MUSB_AM35X
         help
           All data is copied between memory and FIFO by the CPU.
           DMA controllers are ignored.
@@ -171,21 +156,21 @@ config MUSB_PIO_ONLY
 config USB_INVENTRA_DMA
         bool
         depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN || ARCH_OMAP4
+        default USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
         help
           Enable DMA transfers using Mentor's engine.
 
 config USB_TI_CPPI_DMA
         bool
         depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        default ARCH_DAVINCI
+        default USB_MUSB_DAVINCI
         help
           Enable DMA transfers when TI CPPI DMA is available.
 
 config USB_TUSB_OMAP_DMA
         bool
         depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        depends on USB_TUSB6010
+        depends on USB_MUSB_TUSB6010
         depends on ARCH_OMAP
         default y
         help