From bc2ece765f0a260ea3389fe5c6c68fc354bcc87a Mon Sep 17 00:00:00 2001
From: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Date: Tue, 22 Mar 2011 15:55:59 +0100
Subject: [PATCH] --- yaml --- r: 248891 b: refs/heads/master c:
 d23894402b33338c51f1863d7f866fdc6f073a02 h: refs/heads/master i:   248889:
 22032179a306ef5b245a9fa91a7358d270793329   248887:
 3478c38bf74ded158de98a533c2613ba0b713ad6 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/musb/Kconfig  | 7 +++++++
 trunk/drivers/usb/musb/Makefile | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e9de01e6ef74..8c8c80141e56 100644
--- 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
index dbb13bd8cb0b..13093481f918 100644
--- 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
index 4e15281b9e02..c4d228b6ef8a 100644
--- 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