diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-08-13 19:02:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-08-13 19:02:16 +0000 |
| commit | 6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe (patch) | |
| tree | 6fa29f8171e6dafd43d0fa4235661053dbac6998 /target/linux/ipq806x/patches-3.18 | |
| parent | 4561cc2ccaeb939a17b6e2d3a49adbd26712ea26 (diff) | |
| download | upstream-6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe.tar.gz upstream-6cc5919e8a7d3f9bee02dfb5bf1a33e35f9b1efe.tar.bz2 upstream-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')
4 files changed, 3 insertions, 16 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 @@ diff --git a/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch b/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch index 94e4e6b2dd..77be8862e9 100644 --- a/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch +++ b/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch @@ -57,7 +57,7 @@ arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 36 ++++++++++++++++++++++++++++++++ }; gsbi@16300000 { -@@ -174,5 +199,19 @@ +@@ -170,5 +195,19 @@ pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; }; diff --git a/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch b/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch index 75ebfe697b..da8286acc2 100644 --- a/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch +++ b/target/linux/ipq806x/patches-3.18/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 { -@@ -209,6 +219,34 @@ +@@ -205,6 +215,34 @@ nand-ecc-strength = <4>; nand-bus-width = <8>; }; diff --git a/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch index 72a9f8b9b0..8cfc38b811 100644 --- a/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch +++ b/target/linux/ipq806x/patches-3.18/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 { -@@ -247,6 +257,27 @@ +@@ -243,6 +253,27 @@ reg = <4>; }; }; |