---

yaml --- r: 248891 b: refs/heads/master c: d238944 h: refs/heads/master i: 248889: 2203217 248887: 3478c38 v: v3
git-mirror · May 18, 2011 · bc2ece7 · bc2ece7
1 parent 084b06a
commit bc2ece7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dcc8f72e3f3b7ed1ba1cd5641e15658e2140abe
+refs/heads/master: d23894402b33338c51f1863d7f866fdc6f073a02
diff --git a/trunk/drivers/usb/musb/Kconfig b/trunk/drivers/usb/musb/Kconfig
@@ -153,6 +153,13 @@ config MUSB_PIO_ONLY
 	  you can still disable it at run time using the "use_dma=n" module
 	  parameter.
 
+config USB_UX500_DMA
+	bool
+	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
+	default USB_MUSB_UX500
+	help
+	  Enable DMA transfers on UX500 platforms.
+
 config USB_INVENTRA_DMA
 	bool
 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY

diff --git a/trunk/drivers/usb/musb/Makefile b/trunk/drivers/usb/musb/Makefile
@@ -37,6 +37,11 @@ ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
       ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
 	musb_hdrc-y		+= tusb6010_omap.o
 
+      else
+        ifeq ($(CONFIG_USB_UX500_DMA),y)
+	  musb_hdrc-y		+= ux500_dma.o
+
+        endif
       endif
     endif
   endif