Author: nbd Date: 2015-08-13 21:02:16 +0200 (Thu, 13 Aug 2015) New Revision: 46587
Modified: trunk/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch trunk/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch trunk/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch trunk/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch Log: 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 <[email protected]> Signed-off-by: Mathieu Olivari <[email protected]> Modified: trunk/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch =================================================================== --- trunk/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch 2015-08-12 15:26:18 UTC (rev 46586) +++ trunk/target/linux/ipq806x/patches-3.18/157-ARM-DT-ipq8064-Add-ADM-device-node.patch 2015-08-13 19:02:16 UTC (rev 46587) @@ -11,19 +11,6 @@ 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 @@ Modified: trunk/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch =================================================================== --- trunk/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch 2015-08-12 15:26:18 UTC (rev 46586) +++ trunk/target/linux/ipq806x/patches-3.18/165-arm-qcom-dts-Enable-NAND-node-on-IPQ8064-AP148-platform.patch 2015-08-13 19:02:16 UTC (rev 46587) @@ -57,7 +57,7 @@ }; gsbi@16300000 { -@@ -174,5 +199,19 @@ +@@ -170,5 +195,19 @@ pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; }; Modified: trunk/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch =================================================================== --- trunk/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch 2015-08-12 15:26:18 UTC (rev 46586) +++ trunk/target/linux/ipq806x/patches-3.18/707-ARM-dts-qcom-add-mdio-nodes-to-ap148-db149.patch 2015-08-13 19:02:16 UTC (rev 46587) @@ -38,7 +38,7 @@ }; gsbi@16300000 { -@@ -209,6 +219,34 @@ +@@ -205,6 +215,34 @@ nand-ecc-strength = <4>; nand-bus-width = <8>; }; Modified: trunk/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch =================================================================== --- trunk/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch 2015-08-12 15:26:18 UTC (rev 46586) +++ trunk/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch 2015-08-13 19:02:16 UTC (rev 46587) @@ -29,7 +29,7 @@ }; gsbi@16300000 { -@@ -247,6 +257,27 @@ +@@ -243,6 +253,27 @@ reg = <4>; }; }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
