From 5337af031e4cb489f0bfc0ee9becea4eb39fb2db Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Sun, 11 Aug 2013 15:10:38 +0000
Subject: [PATCH] imx6: fix sdma

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37752
---
 ...able-to-build-host-support-as-module.patch |  3 +-
 ...l-imx6qdl-use-the-same-SDMA-firmware.patch | 29 +++++++++++++++++++
 target/linux/imx6/patches-3.10/101-sdma.patch | 22 ++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 target/linux/imx6/patches-3.10/0004-ARM-dts-imx6sl-imx6qdl-use-the-same-SDMA-firmware.patch
 create mode 100644 target/linux/imx6/patches-3.10/101-sdma.patch

diff --git a/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch b/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch
index 9d922536eb..e5cac57d72 100644
--- a/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch
+++ b/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch
@@ -7,7 +7,8 @@ USB_CHIPIDEA_HOST does not need to depend on USB=y, USB_CHIPIDEA_HOST will work
 just fine even if USB=m is used. The depends line can be safely removed since
 USB_CHIPIDEA already depends on USB.
 
-Tested on Gateworks imx6 Ventana board (gw-5400-a).
+Tested on Gateworks imx6q Ventana board (gw-5400-a) and imx6dl Wandboard Dual
+(imx6dl-wandboard).
 
 Signed-off-by: Luka Perkov <luka@openwrt.org>
 ---
diff --git a/target/linux/imx6/patches-3.10/0004-ARM-dts-imx6sl-imx6qdl-use-the-same-SDMA-firmware.patch b/target/linux/imx6/patches-3.10/0004-ARM-dts-imx6sl-imx6qdl-use-the-same-SDMA-firmware.patch
new file mode 100644
index 0000000000..8b1126f865
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/0004-ARM-dts-imx6sl-imx6qdl-use-the-same-SDMA-firmware.patch
@@ -0,0 +1,29 @@
+From 1e8efc07613f5fbf59ad7e580132c473a9b1d3eb Mon Sep 17 00:00:00 2001
+From: Luka Perkov <luka@openwrt.org>
+Date: Sun, 11 Aug 2013 13:13:16 +0200
+Subject: [PATCH 2/3] ARM: dts: imx6sl/imx6qdl: use the same SDMA firmware
+
+Patch for SDMA firmware sent by Fabio Estevam in January [1] didn't make
+upstream. Nonetheless, it was pointed out that all imx6 use the same SDMA
+firmware [2]. Reflect this fact in appropriate .dtsi files.
+
+[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-January/143025.html
+[2] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-January/143150.html
+
+Signed-off-by: Luka Perkov <luka@openwrt.org>
+---
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sl.dtsi  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/imx6qdl.dtsi
++++ b/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -580,7 +580,7 @@
+ 				interrupts = <0 2 0x04>;
+ 				clocks = <&clks 155>, <&clks 155>;
+ 				clock-names = "ipg", "ahb";
+-				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
++				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6.bin";
+ 			};
+ 		};
+ 
diff --git a/target/linux/imx6/patches-3.10/101-sdma.patch b/target/linux/imx6/patches-3.10/101-sdma.patch
new file mode 100644
index 0000000000..2c69b93bed
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/101-sdma.patch
@@ -0,0 +1,22 @@
+From 2714c54667f4e9267e7ee9a7f27fa9184d570459 Mon Sep 17 00:00:00 2001
+From: Luka Perkov <luka@openwrt.org>
+Date: Sun, 11 Aug 2013 16:14:39 +0200
+Subject: [PATCH 3/3] sdma: keep the firmware binaries in firmware directory
+
+Signed-off-by: Luka Perkov <luka@openwrt.org>
+---
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sl.dtsi  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/imx6qdl.dtsi
++++ b/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -580,7 +580,7 @@
+ 				interrupts = <0 2 0x04>;
+ 				clocks = <&clks 155>, <&clks 155>;
+ 				clock-names = "ipg", "ahb";
+-				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6.bin";
++				fsl,sdma-ram-script-name = "sdma-imx6.bin";
+ 			};
+ 		};
+ 
-- 
2.30.2