imx6: update upstream patch

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 42081

2 files changed, 42 insertions, 55 deletions

diff --git a/target/linux/imx6/patches-3.14/0007-ARM-dts-imx-drop-invalid-size-and-address-cells-prop.patch b/target/linux/imx6/patches-3.14/0007-ARM-dts-imx-drop-invalid-size-and-address-cells-prop.patch
new file mode 100644
index 0000000000..075e4a9670
--- /dev/null
+++ b/target/linux/imx6/patches-3.14/0007-ARM-dts-imx-drop-invalid-size-and-address-cells-prop.patch
@@ -0,0 +1,42 @@
+From 54e8eaeec1227a024373e37315770cc79d69917b Mon Sep 17 00:00:00 2001
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Fri, 28 Mar 2014 17:25:51 +0100
+Subject: [PATCH] ARM: dts: imx: drop invalid size and address cells properties
+
+Those two properties should have been set to zero, which
+is the same as not specifying them.
+
+Having address-cells set to 1 causes OF interrupt
+mapping routines to add 1 to the interrupt-cells
+property and as result fail because all calculations
+are off by one.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
+---
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 --
+ arch/arm/boot/dts/imx6sl.dtsi  | 2 --
+ 2 files changed, 4 deletions(-)
+
+--- a/arch/arm/boot/dts/imx6qdl.dtsi
++++ b/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -40,8 +40,6 @@
+ 	intc: interrupt-controller@00a01000 {
+ 		compatible = "arm,cortex-a9-gic";
+ 		#interrupt-cells = <3>;
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+ 		interrupt-controller;
+ 		reg = <0x00a01000 0x1000>,
+ 		      <0x00a00100 0x100>;
+--- a/arch/arm/boot/dts/imx6sl.dtsi
++++ b/arch/arm/boot/dts/imx6sl.dtsi
+@@ -44,8 +44,6 @@
+ 	intc: interrupt-controller@00a01000 {
+ 		compatible = "arm,cortex-a9-gic";
+ 		#interrupt-cells = <3>;
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+ 		interrupt-controller;
+ 		reg = <0x00a01000 0x1000>,
+ 		      <0x00a00100 0x100>;
diff --git a/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch b/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch
deleted file mode 100644
index 463d757f96..0000000000
--- a/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit d644122d8420c425fdf5c74e50d440d5f146bc0c
-Author: Tim Harvey <tharvey@gateworks.com>
-Date:   Thu Mar 13 09:37:51 2014 -0700
-
-    ARM: dts: imx: fix invalid #address-cells value
-    
-    The invalid value of #address-cells in the imx6 pcie host controller node
-    causes of_irq_parse_raw() to incorrectly advance through an interrupt-map
-    table of more than one interrupt. We also take the opportunity to drop the
-    unused #size-cells here.
-    
-    This patch resolves this issue and allows proper interrupt mapping for an
-    imx6 pcie host connected to a P2P bridge when using legacy interrupts.
-    
-    Signed-off-by: Tim Harvey <tharvey@gateworks.com>
-    Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
-    Cc: Jingoo Han <jg1.han@samsung.com>
-    Cc: Lucas Stach <l.stach@pengutronix.de>
-    Cc: Mark Rutland <mark.rutland@arm.com>
-    Cc: linux-samsung-soc <linux-samsung-soc@vger.kernel.org>
-    Cc: Richard Zhu <r65037@freescale.com>
-    Cc: Sascha Hauer <kernel@pengutronix.de>
-    Cc: Arnd Bergmann <arnd@arndb.de>
-    Cc: Stephen Warren <swarren@wwwdotorg.org>
-    Cc: Bjorn Helgaas <bhelgaas@google.com>
-    Cc: Simon Horman <horms@verge.net.au>
-    Cc: Thierry Reding <thierry.reding@gmail.com>
-    Cc: Ben Dooks <ben-linux@fluff.org>
-    Cc: linux-tegra <linux-tegra@vger.kernel.org>
-    Cc: Kukjin Kim <kgene.kim@samsung.com>
-    Cc: Shawn Guo <shawn.guo@linaro.org>
-    Cc: Grant Likely <grant.likely@linaro.org>
-
---- a/arch/arm/boot/dts/imx6qdl.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -40,8 +40,6 @@
- 	intc: interrupt-controller@00a01000 {
- 		compatible = "arm,cortex-a9-gic";
- 		#interrupt-cells = <3>;
--		#address-cells = <1>;
--		#size-cells = <1>;
- 		interrupt-controller;
- 		reg = <0x00a01000 0x1000>,
- 		      <0x00a00100 0x100>;
---- a/arch/arm/boot/dts/imx6sl.dtsi
-+++ b/arch/arm/boot/dts/imx6sl.dtsi
-@@ -44,8 +44,6 @@
- 	intc: interrupt-controller@00a01000 {
- 		compatible = "arm,cortex-a9-gic";
- 		#interrupt-cells = <3>;
--		#address-cells = <1>;
--		#size-cells = <1>;
- 		interrupt-controller;
- 		reg = <0x00a01000 0x1000>,
- 		      <0x00a00100 0x100>;