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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46599 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 bb9a194..a833280 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(+)
 
  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 @@
 --- 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 2231d2d..8832756 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 {
                };
  
                gsbi@16300000 {

-@@ -150,5 +172,19 @@
+@@ -146,5 +168,19 @@

                        pinctrl-0 = <&pcie1_pins>;
                        pinctrl-names = "default";
                };
                        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 c1e267a..940f031 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 {
                };
  
                gsbi@16300000 {

-@@ -182,6 +192,34 @@
+@@ -178,6 +188,34 @@

                        nand-ecc-strength = <4>;
                        nand-bus-width = <8>;
                };
                        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 4a43ae4..0324e02 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 {
                };
  
                gsbi@16300000 {

-@@ -220,6 +230,27 @@
+@@ -216,6 +226,27 @@

                                reg = <4>;
                        };
                };
                                reg = <4>;
                        };
                };