ipq806x: disable DMA on the SPI flash
Previous patch 6f2905eeb6ce5ddec8d12d677e1f377a940b537b enabled ADM in the kernel, which causes a kernel panic when accessing the SPI flash. As a workaround, We'll disable DMA for the flash for now. It was not enabled previously anyway so we'll just leave it as is. Reported-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 46587
This commit is contained in:
parent
4561cc2cca
commit
6cc5919e8a
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
|
||||||
@@ -657,5 +657,25 @@
|
@@ -657,5 +657,25 @@
|
||||||
|
|
|
@ -57,7 +57,7 @@ arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 36 ++++++++++++++++++++++++++++++++
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -174,5 +199,19 @@
|
@@ -170,5 +195,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 {
|
||||||
@@ -209,6 +219,34 @@
|
@@ -205,6 +215,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 {
|
||||||
@@ -247,6 +257,27 @@
|
@@ -243,6 +253,27 @@
|
||||||
reg = <4>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue