ipq806x: disable dma for spi on linux 4.1 as well

Linux 4.1 is also affected from the dma issue, so remove the dma
proprties there as well.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46599

diff --git a/target/linux/ipq806x/patches-4.1/157-ARM-DT-ipq8064-Add-ADM-device-node.patch b/target/linux/ipq806x/patches-4.1/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
index bb9a1946007f9945aef5220f431f2111478caf3b..a8332806b7edbae979da14f18ed36e0cda533190 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
+++ b/target/linux/ipq806x/patches-4.1/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
@@ -11,19 +11,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
  arch/arm/boot/dts/qcom-ipq8064.dtsi      | 21 +++++++++++++++++++++
  2 files changed, 25 insertions(+)
 
---- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-@@ -90,6 +90,10 @@
- 
-                               cs-gpios = <&qcom_pinmux 20 0>;
- 
-+                              dmas = <&adm_dma 6>,
-+                                      <&adm_dma 5>;
-+                              dma-names = "rx", "tx";
-+
-                               flash: m25p80@0 {
-                                       compatible = "s25fl256s1";
-                                       #address-cells = <1>;
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -595,5 +595,25 @@

diff --git a/target/linux/ipq806x/patches-4.1/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch b/target/linux/ipq806x/patches-4.1/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch
index 2231d2d37e1bbaeead7761c34755a1a55fd293c5..88327562165a535500050b75297cd8fa4f1aba5e 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch
+++ b/target/linux/ipq806x/patches-4.1/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch
@@ -54,7 +54,7 @@ arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 36 ++++++++++++++++++++++++++++++++
                };
  
                gsbi@16300000 {
-@@ -150,5 +172,19 @@
+@@ -146,5 +168,19 @@
                        pinctrl-0 = <&pcie1_pins>;
                        pinctrl-names = "default";
                };

diff --git a/target/linux/ipq806x/patches-4.1/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch b/target/linux/ipq806x/patches-4.1/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch
index c1e267aa3e7ae12f9b906bfecb7d7d57ca94422f..940f0317d91f572abe68eae5cf1cd6f653a273dd 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch
+++ b/target/linux/ipq806x/patches-4.1/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch
@@ -38,7 +38,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi@16300000 {
-@@ -182,6 +192,34 @@
+@@ -178,6 +188,34 @@
                        nand-ecc-strength = <4>;
                        nand-bus-width = <8>;
                };

diff --git a/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
index 4a43ae4b666cb709437e0b92716125c0d3799a1d..0324e02d2f777792923b9d5d4226ed818358cb52 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
+++ b/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
@@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi@16300000 {
-@@ -220,6 +230,27 @@
+@@ -216,6 +226,27 @@
                                reg = <4>;
                        };
                };