From 94d775d01ade78eac90c145429aa97479451d7cf Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 10 Oct 2024 18:29:06 +0800 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/16654 Signed-off-by: Hauke Mehrtens --- .../arch/arm/boot/dts/qcom/qcom-ipq4018-mf287_common.dtsi | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wac510.dts | 4 ---- .../arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac-c2.dts | 4 ++++ .../arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi | 4 ---- .../arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3-lte6-kit.dts | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-u4019.dtsi | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts | 4 ++++ .../arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-x1pro.dtsi | 4 ---- .../files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-ap-303h.dts | 4 ---- .../arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap3915i.dts | 4 ---- .../arch/arm/boot/dts/qcom/qcom-ipq4029-ws-ap391x.dts | 4 ---- 15 files changed, 8 insertions(+), 52 deletions(-) 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 961b4be56b..bf2fc0e37e 100644 --- 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 f895e2c110..8515f3c034 100644 --- 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 9300568986..e065ef0168 100644 --- 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 119ba4b7fe..352c05e856 100644 --- 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 52af1f125e..b1a04012fb 100644 --- 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 7c0194ccc0..f5a985b6d1 100644 --- 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 bd7565ac02..0418176066 100644 --- 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 67d9f21f71..db00859878 100644 --- 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 ce8d66680a..54e3cc7818 100644 --- 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 d6aaf93b29..3db61b1e37 100644 --- 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 cb7d3a918f..644329419d 100644 --- 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 b494d0ab1c..16b2cd3c80 100644 --- 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 823431dcf1..6227027266 100644 --- 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 3bf9f8c42b..48e0bb903e 100644 --- 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 04b55b1abf..1eb6ea2eb8 100644 --- 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"; }; -- 2.30.2