ipq806x: dts: fix 6.12 kernel pinmux conflicts

Some pinmux nodes in the qcom-ipq8064.dtsi have been changed[1].
Adjust our local devices dts to solve the conflicts.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=de52c020e1a9c3313d88405a4545020b1f5ab24d

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18989
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
index 76751910e01c4d4d00abd430ec2b4de7be0d6a15..fbf5cd67126712ac684852bb264e7bb8ed307a02 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
@@ -25,7 +25,7 @@
        keys {
                compatible = "gpio-keys";
 
-               pinctrl-0 = <&buttons_pins>;
+               pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";
 
                reset {
@@ -66,7 +66,7 @@
        leds {
                compatible = "gpio-leds";
 
-               pinctrl-0 = <&leds_pins>;
+               pinctrl-0 = <&led_pins>;
                pinctrl-names = "default";
 
                led_power_green: power_green {
@@ -135,7 +135,7 @@
        };
 };
 
-/* nand_pins are used for leds_pins, empty the node
+/* nand_pins are used for led_pins, empty the node
  * from ipq8064.dtsi
  */
 &nand_pins {
@@ -148,7 +148,12 @@
        pinctrl-0 = <&akro_pins>;
        pinctrl-names = "default";
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";
@@ -171,7 +176,7 @@
                };
        };
 
-       buttons_pins: buttons_pins {
+       button_pins: button_pins {
                mux {
                        pins = "gpio22", "gpio24", "gpio40",
                                "gpio41";
@@ -181,7 +186,7 @@
                };
        };
 
-       leds_pins: leds_pins {
+       led_pins: led_pins {
                mux {
                        pins = "gpio14", "gpio15", "gpio35",
                                "gpio36", "gpio38", "gpio42",

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
index d8e018367ebe874c97419dbcf26c1c228765df5e..4a28bfc5786353ead96d48b064183a822cc1427e 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
@@ -28,7 +28,12 @@
 };
 
 &qcom_pinmux {
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts
index 9d0b451f4360cb548c68fa37d46e8736daa961dd..19995a5e7a2fa1677a609bbb79b99a1aeeb0dbbb 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts
@@ -25,14 +25,12 @@
 };
 
 &qcom_pinmux {
-       rgmii2_pins: rgmii2-pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29",
-                              "gpio30", "gpio31", "gpio32",
-                              "gpio51", "gpio52", "gpio59",
-                              "gpio60", "gpio61", "gpio62",
-                              "gpio2", "gpio66";
-               };
+       rgmii2_pins: rgmii2-state {
+               pins = "gpio27", "gpio28", "gpio29",
+                      "gpio30", "gpio31", "gpio32",
+                      "gpio51", "gpio52", "gpio59",
+                      "gpio60", "gpio61", "gpio62",
+                      "gpio2", "gpio66";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
index 813eb050b45d95e4e4e44999f7164c5046333035..202731e9f02848e2ec1108b12bbaa43d8402f815 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
@@ -116,8 +116,23 @@
                };
        };
 
-       rgmii2_pins: rgmii2-pins {
-               mux {
+       rgmii2_pins: rgmii2-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux-1 {
+                       pins = "gpio27", "gpio28", "gpio29",
+                               "gpio30", "gpio31", "gpio32",
+                               "gpio51", "gpio52", "gpio59",
+                               "gpio60", "gpio61", "gpio62";
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               mux-2 {
                        bias-disable;
                        drive-strength = <16>;
                        function = "rgmii2";
@@ -125,7 +140,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
index 2010c4f7b8c12097767912dffd801fa70a8a314f..08f5a4487c73441e6b261a9f0a7fc1674e9a4b5f 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
@@ -271,7 +271,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
index a1717a999bb7c2207efbc24b1e26662a262a583a..f750d32e7502e0a1fcfbef07a36538d9e4ed9d3b 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
@@ -71,7 +71,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
index 3df650eba4d6dc078fadf8a9b3ded5a3dde19fb4..5a4ce00f5f350b06bb845d0496df064b1b42571d 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
@@ -144,7 +144,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
index b97b4325f21e795ce4afd9dc979005d7b82265fc..3c99472a097a843b3ba546aca61de61a782f006d 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
@@ -516,7 +516,12 @@ switch@10 {
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts
index 0fb7e0531d5230b98561d97defc9d1c5555d6c2d..d0ff076a407202774ce5a1840837e68ed52d6bc7 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts
@@ -528,7 +528,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
index b3561cafe7613da27c80def8413c130a58fc3a5f..ad9201d01811ce618605abd625201b71d178cb44 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
@@ -586,7 +586,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
index 7151f8de525bb7270bd7d29d7e7e0f9bc12bfa19..6c7dc0936a2258bca3a059d0ec9ec2a2c7bf9193 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
@@ -102,7 +102,12 @@
 };
 
 &qcom_pinmux {
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
index 9a9251e9b953058c2b53507e622c85a10560117c..310ad98b57971840e6f7035e05ff96a0debe2a3a 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
@@ -110,21 +110,60 @@
                };
        };
 
-       mdio0_pins: mdio0-pins {
+       mdio0_pins: mdio0-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
                clk {
                        pins = "gpio1";
                        input-disable;
                };
        };
 
-       rgmii2_pins: rgmii2-pins {
+       rgmii2_pins: rgmii2-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29",
+                               "gpio30", "gpio31", "gpio32",
+                               "gpio51", "gpio52", "gpio59",
+                               "gpio60", "gpio61", "gpio62";
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
                tx {
                        pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
                        input-disable;
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
                cs {
                        pins = "gpio20";
                        drive-strength = <12>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
index a2d916faaf46544d9012b07fdf560f2088ee8ffa..589c04af2b684c9a5e555c0293b45bfe46f174f9 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
@@ -130,14 +130,41 @@
                };
        };
 
-       mdio0_pins: mdio0-pins {
+       mdio0_pins: mdio0-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
                clk {
                        pins = "gpio1";
                        input-disable;
                };
        };
 
-       rgmii2_pins: rgmii2-pins {
+       rgmii2_pins: rgmii2-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29",
+                               "gpio30", "gpio31", "gpio32",
+                               "gpio51", "gpio52", "gpio59",
+                               "gpio60", "gpio61", "gpio62";
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
                tx {
                        pins = "gpio27", "gpio28", "gpio29",
                                "gpio30", "gpio31", "gpio32";
@@ -145,7 +172,12 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19", "gpio21";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
index cd63f92db65121ccb7ff8fe5543cce5ce6805cc6..22624ce59ceb11317e75e4f52990f118709445ea 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
@@ -84,7 +84,12 @@
                };
        };
 
-       rgmii2_pins: rgmii2-pins {
+       rgmii2_pins: rgmii2-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31",
                                "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62";
@@ -99,7 +104,19 @@
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
                cs {
                        pins = "gpio20";
                        drive-strength = <12>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
index 176ae2933762ce10b0a1e7ed6e668b6ef3787d75..95133b470986bd4ccc562cc7d8abd2bffbb36287 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
@@ -84,14 +84,41 @@
                };
        };
 
-       rgmii2_pins: rgmii2-pins {
+       rgmii2_pins: rgmii2-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29",
+                               "gpio30", "gpio31", "gpio32",
+                               "gpio51", "gpio52", "gpio59",
+                               "gpio60", "gpio61", "gpio62";
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
                tx {
                        pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32";
                        input-disable;
                };
        };
 
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
                cs {
                        pins = "gpio20";
                        drive-strength = <12>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
index f26d026be851d9ef998de719d90085e929d85dbf..4a6fbf4f3f6b72c02eaeff8e371097df29a434ec 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
@@ -99,7 +99,12 @@
 
 
 &qcom_pinmux {
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
index 9f6c5fb696978402ff54a0f35861f44bc27af781..b809a2fd1a25e7eac048435fa78adb84f9f5d6c9 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
@@ -103,7 +103,12 @@
 
 
 &qcom_pinmux {
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19";
                        function = "gsbi5";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
index 5174927a0f5e74162ca11aba26cd801d20489ab3..f3fa42be3aa31a15fab1ff9e79d0d1429a7eac46 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
@@ -95,7 +95,12 @@
 };
 
 &qcom_pinmux {
-       spi_pins: spi_pins {
+       spi_pins: spi-state {
+               /delete-property/ pins;
+               /delete-property/ function;
+               /delete-property/ drive-strength;
+               /delete-property/ bias-disable;
+
                mux {
                        pins = "gpio18", "gpio19";
                        function = "gsbi5";