imx6: disable sdma until license issues are solved

Also, synchronize patches with upstream.

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

SVN-Revision: 37853

5 files changed, 55 insertions, 81 deletions

diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index 1a1d30a..7978cd8 100644
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -170,7 +170,7 @@ CONFIG_I2C_IMX=y
 # CONFIG_IMX2_WDT is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_PCIE=y
-CONFIG_IMX_SDMA=y
+# CONFIG_IMX_SDMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
@@ -213,8 +213,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
+# CONFIG_MX3_IPU is not set
 # CONFIG_MXC_DEBUG_BOARD is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
 CONFIG_MXS_DMA=y
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
deleted file mode 100644
index e5cac57..0000000
--- a/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f51ac206b1ca27d240fe7fde6975496d558f51df Mon Sep 17 00:00:00 2001
-From: Luka Perkov <luka@openwrt.org>
-Date: Sun, 4 Aug 2013 03:10:59 +0200
-Subject: [PATCH] usb: chipidea: enable to build host support as module
-
-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 imx6q Ventana board (gw-5400-a) and imx6dl Wandboard Dual
-(imx6dl-wandboard).
-
-Signed-off-by: Luka Perkov <luka@openwrt.org>
----
- drivers/usb/chipidea/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/chipidea/Kconfig
-+++ b/drivers/usb/chipidea/Kconfig
-@@ -19,7 +19,6 @@ config USB_CHIPIDEA_UDC
- 
- config USB_CHIPIDEA_HOST
- 	bool "ChipIdea host controller"
--	depends on USB=y
- 	depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m)
- 	select USB_EHCI_ROOT_HUB_TT
- 	help
diff --git a/target/linux/imx6/patches-3.10/0003-usb-chipidea-improve-kconfig-2.0.patch b/target/linux/imx6/patches-3.10/0003-usb-chipidea-improve-kconfig-2.0.patch
new file mode 100644
index 0000000..40968ab
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/0003-usb-chipidea-improve-kconfig-2.0.patch
@@ -0,0 +1,53 @@
+From a0cfdc6bc73bc47b63b05b850cf66cf67f2487bf Mon Sep 17 00:00:00 2001
+From: Lothar Waßmann <LW@KARO-electronics.de>
+Date: Wed, 14 Aug 2013 12:43:58 +0300
+Subject: [PATCH] usb: chipidea: improve kconfig 2.0
+
+This patch provides a cleaner solution to the problem described in
+commit 20a677fd ("usb: chipidea: improve kconfig").
+
+The goal to be achieved is to force USB_CHIPIDEA=m if either
+USB_EHCI_HCD=m or USB_GADGET=m.
+If both are 'y' USB_CHIPIDEA may be selected to be 'm' or 'y'.
+
+The old patch had the drawback, that USB_CHIPIDEA could be chosen as
+'y' though USB_EHCI_HCD or USB_GADGET (or both) were 'm' leading to a
+situation where USB_CHIPIDEA_HOST or USB_CHIPIDEA_UDC vanished from
+the config options producing a compilable but dysfunctional driver.
+
+Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
+Reviewed-by: Peter Chen <peter.chen@freescale.com>
+Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/chipidea/Kconfig | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/drivers/usb/chipidea/Kconfig
++++ b/drivers/usb/chipidea/Kconfig
+@@ -1,6 +1,6 @@
+ config USB_CHIPIDEA
+ 	tristate "ChipIdea Highspeed Dual Role Controller"
+-	depends on USB || USB_GADGET
++	depends on (USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)
+ 	help
+ 	  Say Y here if your system has a dual role high speed USB
+ 	  controller based on ChipIdea silicon IP. Currently, only the
+@@ -12,15 +12,14 @@ if USB_CHIPIDEA
+ 
+ config USB_CHIPIDEA_UDC
+ 	bool "ChipIdea device controller"
+-	depends on USB_GADGET=y || (USB_CHIPIDEA=m && USB_GADGET=m)
++	depends on USB_GADGET
+ 	help
+ 	  Say Y here to enable device controller functionality of the
+ 	  ChipIdea driver.
+ 
+ config USB_CHIPIDEA_HOST
+ 	bool "ChipIdea host controller"
+-	depends on USB=y
+-	depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m)
++	depends on USB_EHCI_HCD
+ 	select USB_EHCI_ROOT_HUB_TT
+ 	help
+ 	  Say Y here to enable host controller functionality of the
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
deleted file mode 100644
index 8b1126f..0000000
--- a/target/linux/imx6/patches-3.10/0004-ARM-dts-imx6sl-imx6qdl-use-the-same-SDMA-firmware.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 2c69b93..0000000
--- a/target/linux/imx6/patches-3.10/101-sdma.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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";
- 			};
- 		};
-