Merge branch 'fix/hda' into for-linus

[linux-2.6] / drivers / usb / musb / Kconfig

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 4b9542b..9985db0 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -11,7 +11,8 @@ config USB_MUSB_HDRC
        depends on (USB || USB_GADGET) && HAVE_CLK
        depends on !SUPERH
        select TWL4030_USB if MACH_OMAP_3430SDP
-       tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'
+       select USB_OTG_UTILS
+       tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
        help
          Say Y here if your system has a dual role high speed USB
          controller based on the Mentor Graphics silicon IP.  Then
@@ -22,6 +23,9 @@ config USB_MUSB_HDRC
          Texas Instruments parts using this IP include DaVinci 644x,
          OMAP 243x, OMAP 343x, and TUSB 6010.
 
+         Analog Devices parts using this IP include Blackfin BF54x,
+         BF525 and BF527.
+
          If you do not know what this is, please say N.
 
          To compile this driver as a module, choose M here; the
@@ -33,6 +37,8 @@ config USB_MUSB_SOC
        default y if ARCH_DAVINCI
        default y if ARCH_OMAP2430
        default y if ARCH_OMAP34XX
+       default y if (BF54x && !BF544)
+       default y if (BF52x && !BF522 && !BF523)
 
 comment "DaVinci 644x USB support"
        depends on USB_MUSB_HDRC && ARCH_DAVINCI
@@ -43,6 +49,9 @@ comment "OMAP 243x high speed USB support"
 comment "OMAP 343x high speed USB support"
        depends on USB_MUSB_HDRC && ARCH_OMAP34XX
 
+comment "Blackfin high speed USB Support"
+       depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
+
 config USB_TUSB6010
        boolean "TUSB 6010 support"
        depends on USB_MUSB_HDRC && !USB_MUSB_SOC
@@ -142,7 +151,7 @@ config MUSB_PIO_ONLY
 config USB_INVENTRA_DMA
        bool
        depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-       default ARCH_OMAP2430 || ARCH_OMAP34XX
+       default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN
        help
          Enable DMA transfers using Mentor's engine.