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
This commit is contained in:
parent
6be2305da8
commit
1c56854639
4 changed files with 3 additions and 16 deletions
|
@ -11,19 +11,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
arch/arm/boot/dts/qcom-ipq8064.dtsi | 21 +++++++++++++++++++++
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 21 +++++++++++++++++++++
|
||||||
2 files changed, 25 insertions(+)
|
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
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
@@ -595,5 +595,25 @@
|
@@ -595,5 +595,25 @@
|
||||||
|
|
|
@ -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-0 = <&pcie1_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
};
|
};
|
||||||
|
|
|
@ -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-ecc-strength = <4>;
|
||||||
nand-bus-width = <8>;
|
nand-bus-width = <8>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -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>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue