aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorMaulik Mankad <x0082077@ti.com>2010-03-12 03:29:08 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:32 -0400
commitc71b1b9c21fa8f73028ebe82b17f738d3bf327f5 (patch)
treee3f11749744a7f42527a491b35327210e71b72f0 /drivers/usb/musb
parentde2e1b0c988c901989713869a8bea3b3d02bb9ce (diff)
USB: MUSB: Build MUSB driver for OMAP4
This patch updates the Makefile to build the MUSB driver for OMAP4. It also sets the Kconfig options for OMAP4. Signed-off-by: Maulik Mankad <x0082077@ti.com> Cc: David Brownell <david-b@pacbell.net> Cc: Sergei Shtylyov <sshtylyov@mvista.com> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/Kconfig6
-rw-r--r--drivers/usb/musb/Makefile4
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 07fe490b44d8..cfd38edfcf9e 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -38,6 +38,7 @@ config USB_MUSB_SOC
38 default y if ARCH_DAVINCI 38 default y if ARCH_DAVINCI
39 default y if ARCH_OMAP2430 39 default y if ARCH_OMAP2430
40 default y if ARCH_OMAP3 40 default y if ARCH_OMAP3
41 default y if ARCH_OMAP4
41 default y if (BF54x && !BF544) 42 default y if (BF54x && !BF544)
42 default y if (BF52x && !BF522 && !BF523) 43 default y if (BF52x && !BF522 && !BF523)
43 44
@@ -50,6 +51,9 @@ comment "OMAP 243x high speed USB support"
50comment "OMAP 343x high speed USB support" 51comment "OMAP 343x high speed USB support"
51 depends on USB_MUSB_HDRC && ARCH_OMAP3 52 depends on USB_MUSB_HDRC && ARCH_OMAP3
52 53
54comment "OMAP 44xx high speed USB support"
55 depends on USB_MUSB_HDRC && ARCH_OMAP4
56
53comment "Blackfin high speed USB Support" 57comment "Blackfin high speed USB Support"
54 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523)) 58 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
55 59
@@ -153,7 +157,7 @@ config MUSB_PIO_ONLY
153config USB_INVENTRA_DMA 157config USB_INVENTRA_DMA
154 bool 158 bool
155 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY 159 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
156 default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN 160 default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN || ARCH_OMAP4
157 help 161 help
158 Enable DMA transfers using Mentor's engine. 162 Enable DMA transfers using Mentor's engine.
159 163
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 3a485dabebbb..db7933de17b5 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -22,6 +22,10 @@ ifeq ($(CONFIG_ARCH_OMAP3430),y)
22 musb_hdrc-objs += omap2430.o 22 musb_hdrc-objs += omap2430.o
23endif 23endif
24 24
25ifeq ($(CONFIG_ARCH_OMAP4),y)
26 musb_hdrc-objs += omap2430.o
27endif
28
25ifeq ($(CONFIG_BF54x),y) 29ifeq ($(CONFIG_BF54x),y)
26 musb_hdrc-objs += blackfin.o 30 musb_hdrc-objs += blackfin.o
27endif 31endif