Commit 085ad406 authored by Bryan Wu's avatar Bryan Wu Committed by Greg Kroah-Hartman

USB: musb: add Blackfin Kconfig options and Makefile

Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c6cf8b00
...@@ -297,13 +297,13 @@ config USB_S3C2410_DEBUG ...@@ -297,13 +297,13 @@ config USB_S3C2410_DEBUG
# musb builds in ../musb along with host support # musb builds in ../musb along with host support
config USB_GADGET_MUSB_HDRC config USB_GADGET_MUSB_HDRC
boolean "Inventra HDRC USB Peripheral (TI, ...)" boolean "Inventra HDRC USB Peripheral (TI, ADI, ...)"
depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG)
select USB_GADGET_DUALSPEED select USB_GADGET_DUALSPEED
select USB_GADGET_SELECTED select USB_GADGET_SELECTED
help help
This OTG-capable silicon IP is used in dual designs including This OTG-capable silicon IP is used in dual designs including
the TI DaVinci, OMAP 243x, OMAP 343x, and TUSB 6010. the TI DaVinci, OMAP 243x, OMAP 343x, TUSB 6010, and ADI Blackfin
config USB_GADGET_M66592 config USB_GADGET_M66592
boolean "Renesas M66592 USB Peripheral Controller" boolean "Renesas M66592 USB Peripheral Controller"
......
...@@ -11,7 +11,7 @@ config USB_MUSB_HDRC ...@@ -11,7 +11,7 @@ config USB_MUSB_HDRC
depends on (USB || USB_GADGET) && HAVE_CLK depends on (USB || USB_GADGET) && HAVE_CLK
depends on !SUPERH depends on !SUPERH
select TWL4030_USB if MACH_OMAP_3430SDP select TWL4030_USB if MACH_OMAP_3430SDP
tristate 'Inventra Highspeed Dual Role Controller (TI, ...)' tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
help help
Say Y here if your system has a dual role high speed USB Say Y here if your system has a dual role high speed USB
controller based on the Mentor Graphics silicon IP. Then controller based on the Mentor Graphics silicon IP. Then
...@@ -22,6 +22,9 @@ config USB_MUSB_HDRC ...@@ -22,6 +22,9 @@ config USB_MUSB_HDRC
Texas Instruments parts using this IP include DaVinci 644x, Texas Instruments parts using this IP include DaVinci 644x,
OMAP 243x, OMAP 343x, and TUSB 6010. 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. If you do not know what this is, please say N.
To compile this driver as a module, choose M here; the To compile this driver as a module, choose M here; the
...@@ -33,6 +36,8 @@ config USB_MUSB_SOC ...@@ -33,6 +36,8 @@ config USB_MUSB_SOC
default y if ARCH_DAVINCI default y if ARCH_DAVINCI
default y if ARCH_OMAP2430 default y if ARCH_OMAP2430
default y if ARCH_OMAP34XX default y if ARCH_OMAP34XX
default y if (BF54x && !BF544)
default y if (BF52x && !BF522 && !BF523)
comment "DaVinci 644x USB support" comment "DaVinci 644x USB support"
depends on USB_MUSB_HDRC && ARCH_DAVINCI depends on USB_MUSB_HDRC && ARCH_DAVINCI
...@@ -43,6 +48,9 @@ comment "OMAP 243x high speed USB support" ...@@ -43,6 +48,9 @@ comment "OMAP 243x high speed USB support"
comment "OMAP 343x high speed USB support" comment "OMAP 343x high speed USB support"
depends on USB_MUSB_HDRC && ARCH_OMAP34XX 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 config USB_TUSB6010
boolean "TUSB 6010 support" boolean "TUSB 6010 support"
depends on USB_MUSB_HDRC && !USB_MUSB_SOC depends on USB_MUSB_HDRC && !USB_MUSB_SOC
...@@ -142,7 +150,7 @@ config MUSB_PIO_ONLY ...@@ -142,7 +150,7 @@ config MUSB_PIO_ONLY
config USB_INVENTRA_DMA config USB_INVENTRA_DMA
bool bool
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default ARCH_OMAP2430 || ARCH_OMAP34XX default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN
help help
Enable DMA transfers using Mentor's engine. Enable DMA transfers using Mentor's engine.
......
...@@ -22,6 +22,14 @@ ifeq ($(CONFIG_ARCH_OMAP3430),y) ...@@ -22,6 +22,14 @@ ifeq ($(CONFIG_ARCH_OMAP3430),y)
musb_hdrc-objs += omap2430.o musb_hdrc-objs += omap2430.o
endif endif
ifeq ($(CONFIG_BF54x),y)
musb_hdrc-objs += blackfin.o
endif
ifeq ($(CONFIG_BF52x),y)
musb_hdrc-objs += blackfin.o
endif
ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y) ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment