summaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-08-13 19:02:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-08-13 19:02:16 +0000
commit6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe (patch)
tree6fa29f8171e6dafd43d0fa4235661053dbac6998 /target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
parent4561cc2ccaeb939a17b6e2d3a49adbd26712ea26 (diff)
downloadmaster-31e0f0ae-6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe.tar.gz
master-31e0f0ae-6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe.tar.bz2
master-31e0f0ae-6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe.zip
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
Diffstat (limited to 'target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch')
-rw-r--r--target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch b/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
index 64b002267e..4d9e61322c 100644
--- a/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch
+++ b/target/linux/ipq806x/patches-3.18/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
@@ -657,5 +657,25 @@