diff options
author | Bryan Wu <cooloney@kernel.org> | 2008-12-02 14:33:49 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 13:00:08 -0500 |
commit | 085ad4067b5def12bb0e6f50ec65302053d9186d (patch) | |
tree | b81637b02507883a22c18fd0845576a962f1a6c4 /drivers/usb/musb | |
parent | c6cf8b003e5a37f8193c2883876c5942adcd7284 (diff) |
USB: musb: add Blackfin Kconfig options and Makefile
Signed-off-by: Bryan Wu <cooloney@kernel.org>
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/Kconfig | 12 | ||||
-rw-r--r-- | drivers/usb/musb/Makefile | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 4b9542bbb35c..5af7379cd9a3 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig | |||
@@ -11,7 +11,7 @@ config USB_MUSB_HDRC | |||
11 | depends on (USB || USB_GADGET) && HAVE_CLK | 11 | depends on (USB || USB_GADGET) && HAVE_CLK |
12 | depends on !SUPERH | 12 | depends on !SUPERH |
13 | select TWL4030_USB if MACH_OMAP_3430SDP | 13 | select TWL4030_USB if MACH_OMAP_3430SDP |
14 | tristate 'Inventra Highspeed Dual Role Controller (TI, ...)' | 14 | tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' |
15 | help | 15 | help |
16 | Say Y here if your system has a dual role high speed USB | 16 | Say Y here if your system has a dual role high speed USB |
17 | controller based on the Mentor Graphics silicon IP. Then | 17 | controller based on the Mentor Graphics silicon IP. Then |
@@ -22,6 +22,9 @@ config USB_MUSB_HDRC | |||
22 | Texas Instruments parts using this IP include DaVinci 644x, | 22 | Texas Instruments parts using this IP include DaVinci 644x, |
23 | OMAP 243x, OMAP 343x, and TUSB 6010. | 23 | OMAP 243x, OMAP 343x, and TUSB 6010. |
24 | 24 | ||
25 | Analog Devices parts using this IP include Blackfin BF54x, | ||
26 | BF525 and BF527. | ||
27 | |||
25 | If you do not know what this is, please say N. | 28 | If you do not know what this is, please say N. |
26 | 29 | ||
27 | To compile this driver as a module, choose M here; the | 30 | To compile this driver as a module, choose M here; the |
@@ -33,6 +36,8 @@ config USB_MUSB_SOC | |||
33 | default y if ARCH_DAVINCI | 36 | default y if ARCH_DAVINCI |
34 | default y if ARCH_OMAP2430 | 37 | default y if ARCH_OMAP2430 |
35 | default y if ARCH_OMAP34XX | 38 | default y if ARCH_OMAP34XX |
39 | default y if (BF54x && !BF544) | ||
40 | default y if (BF52x && !BF522 && !BF523) | ||
36 | 41 | ||
37 | comment "DaVinci 644x USB support" | 42 | comment "DaVinci 644x USB support" |
38 | depends on USB_MUSB_HDRC && ARCH_DAVINCI | 43 | depends on USB_MUSB_HDRC && ARCH_DAVINCI |
@@ -43,6 +48,9 @@ comment "OMAP 243x high speed USB support" | |||
43 | comment "OMAP 343x high speed USB support" | 48 | comment "OMAP 343x high speed USB support" |
44 | depends on USB_MUSB_HDRC && ARCH_OMAP34XX | 49 | depends on USB_MUSB_HDRC && ARCH_OMAP34XX |
45 | 50 | ||
51 | comment "Blackfin high speed USB Support" | ||
52 | depends on USB_MUSB_HDRC && (BF54x && !BF544) || (BF52x && !BF522 && !BF523) | ||
53 | |||
46 | config USB_TUSB6010 | 54 | config USB_TUSB6010 |
47 | boolean "TUSB 6010 support" | 55 | boolean "TUSB 6010 support" |
48 | depends on USB_MUSB_HDRC && !USB_MUSB_SOC | 56 | depends on USB_MUSB_HDRC && !USB_MUSB_SOC |
@@ -142,7 +150,7 @@ config MUSB_PIO_ONLY | |||
142 | config USB_INVENTRA_DMA | 150 | config USB_INVENTRA_DMA |
143 | bool | 151 | bool |
144 | depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY | 152 | depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY |
145 | default ARCH_OMAP2430 || ARCH_OMAP34XX | 153 | default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN |
146 | help | 154 | help |
147 | Enable DMA transfers using Mentor's engine. | 155 | Enable DMA transfers using Mentor's engine. |
148 | 156 | ||
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index b6af0d687a73..85710ccc1887 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile | |||
@@ -22,6 +22,14 @@ ifeq ($(CONFIG_ARCH_OMAP3430),y) | |||
22 | musb_hdrc-objs += omap2430.o | 22 | musb_hdrc-objs += omap2430.o |
23 | endif | 23 | endif |
24 | 24 | ||
25 | ifeq ($(CONFIG_BF54x),y) | ||
26 | musb_hdrc-objs += blackfin.o | ||
27 | endif | ||
28 | |||
29 | ifeq ($(CONFIG_BF52x),y) | ||
30 | musb_hdrc-objs += blackfin.o | ||
31 | endif | ||
32 | |||
25 | ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y) | 33 | ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y) |
26 | musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o | 34 | musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o |
27 | endif | 35 | endif |