ipq40xx: dts: disable qpic_bam for EMMC and SPI Flash devices

The qpic DMA controller is used by the parallel NAND Flash
interface. We don't need to enable it when nand-controller node
is marked as disabled.

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16654
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-mf287_common.dtsi
index 961b4be56b35f5d6cf8ca5b15e551e241f1c80ef..bf2fc0e37e2e59d62f35ce8b3c6af1c832dee8a5 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-mf287_common.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-mf287_common.dtsi
@@ -159,10 +159,6 @@
        label = "lan4";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wac510.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wac510.dts
index f895e2c110ea88673c2f152e91bafc22211f0f34..8515f3c0347877085d54404414ba3831ff84695b 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wac510.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wac510.dts
@@ -149,10 +149,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        mdio_pins: mdio_pinmux {
                mux_1 {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac-c2.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac-c2.dts
index 9300568986637df1ddfde096c2c07aa95dc38a54..e065ef0168016db4f3b053410b65bdc3ff6d8e85 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac-c2.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac-c2.dts
@@ -114,6 +114,10 @@
        };
 };
 
+&qpic_bam {
+       status = "okay";
+};
+
 &tlmm {
        nand_pins: nand-pins {
 

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
index 119ba4b7fe5fd180868c199832090e4976115487..352c05e8563bcd9f356e3120be9da8a8598c108e 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
@@ -116,10 +116,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        i2c_0_pins: i2c-0-pinmux {
                mux {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3-lte6-kit.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3-lte6-kit.dts
index 52af1f125e26d884873983d4ee3b124765f6cd0f..b1a04012fb2a8017e0ef73fc64e0c98325dcbbdb 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3-lte6-kit.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3-lte6-kit.dts
@@ -227,10 +227,6 @@
        };
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &blsp1_uart1 {
        status = "okay";
        pinctrl-0 = <&serial_pins>;

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
index 7c0194ccc0243c5889cf7e4870518cb5cdcc208a..f5a985b6d1692f4d1352aea48102f28b305100fa 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
@@ -339,10 +339,6 @@
        label = "lan";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        i2c_0_pins: i2c_0_pinmux {
                mux {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
index bd7565ac02ec037b043e79966fd74d323cff7756..0418176066dc7ea9a7a443a8c64db9031964cfa0 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
@@ -132,10 +132,6 @@
        vqmmc-supply = <&vqmmc>;
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        mdio_pins: mdio_pinmux {
                mux_1 {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-u4019.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-u4019.dtsi
index 67d9f21f71ec017ac48e25552f75f34b46d7fba8..db00859878b831d4a467930c9aafbd8487fbc5ed 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-u4019.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-u4019.dtsi
@@ -90,10 +90,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        mdio_pins: mdio_pinmux {
                mux_1 {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
index ce8d66680aa4eeaf3fe96875c016dd971cd59fad..54e3cc7818c183cbc67b118d4f50f50cea58f0b2 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
@@ -249,10 +249,6 @@
        };
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &gmac {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
index d6aaf93b2974629d455abd320c6d7edb3dcf26af..3db61b1e3779665b096abdaa40287e055b78ae5e 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
@@ -202,6 +202,10 @@
        };
 };
 
+&qpic_bam {
+       status = "okay";
+};
+
 &swport4 {
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_gmac1>;

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
index cb7d3a918f0e137704318c02de9954d6ed1b8195..644329419d97a95b4d7f5da10735c2c81e70b0a4 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
@@ -312,10 +312,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &switch {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-x1pro.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-x1pro.dtsi
index b494d0ab1c7b734c2d7087b6cbdc4770eb76372c..16b2cd3c80ae1ada1eae962e24379f5044d99344 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-x1pro.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-x1pro.dtsi
@@ -91,10 +91,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        mdio_pins: mdio_pinmux {
                mux_1 {

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ap-303h.dts
index 823431dcf11d2f1fbc9f9e3a09e30a225c975966..622702726629341e2fbd1577f381db8af1396e1b 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ap-303h.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ap-303h.dts
@@ -132,10 +132,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &tlmm {
        /*
         * In addition to the Pins listed below,

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap3915i.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap3915i.dts
index 3bf9f8c42b0ca105f7b20f8fee6fd0e019a936e9..48e0bb903e54504035bf454c51dea877b62aae29 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap3915i.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap3915i.dts
@@ -114,10 +114,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &mdio {
        status = "okay";
        pinctrl-0 = <&mdio_pins>;

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap391x.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap391x.dts
index 04b55b1abf9edfbd852adc091e08826e8f1caf89..1eb6ea2eb895b05149cd262461cf01a7ed8eed78 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap391x.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap391x.dts
@@ -171,10 +171,6 @@
        status = "okay";
 };
 
-&qpic_bam {
-       status = "okay";
-};
-
 &gmac {
        status = "okay";
 };