ipq806x: move common pinmux nodes to SoC DTSI

As almost same pinmux nodes are repeated in each device dts,
let's define them once in the ipq8064 dtsi and remove the rest.

* uart0_pins : Did not touch.
* i2c4_pins  : This node seems to be not used at all in dts.
               Added the most common form in the dtsi. Did not touch rpm_pins.
* spi_pins   : The common mux node is already present in the dtsi.
               Removed the duplicate nodes from dts.
* nand_pins  : Moved the entire node.
* mdio0_pins : Moved the common mux node.
* rgmii2_pins: Moved the common mux node. "pins" property is overrided in ap161.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index d55379380dbd95e35cc3e91319e3916e18f8ceef..1db75a062a4e6bc4a29105961a02c32c9fdef4d7 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -29,59 +29,6 @@
        };
 };
 
-&qcom_pinmux {
-       i2c4_pins: i2c4_pinmux {
-               pins = "gpio12", "gpio13";
-               function = "gsbi4";
-               bias-disable;
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                              "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                              "gpio43", "gpio44", "gpio45",
-                              "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-};
-
 &adm_dma {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index d6e6e000ca501cebbda311bc7f6f6890306d0c9d..e8de2c3519633a5a8c5c6fadf9ef7cbef3632818 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -30,65 +30,13 @@
 };
 
 &qcom_pinmux {
-       i2c4_pins: i2c4_pinmux {
-               pins = "gpio12", "gpio13";
-               function = "gsbi4";
-               bias-disable;
-       };
-
-       spi_pins: spi_pins {
-               mux {
-                       pins = "gpio18", "gpio19", "gpio21";
-                       function = "gsbi5";
-                       drive-strength = <10>;
-                       bias-none;
-               };
-       };
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        rgmii2_pins: rgmii2_pins {
                mux {
-                       pins = "gpio2", "gpio27", "gpio28",
-                               "gpio29", "gpio30", "gpio31",
-                               "gpio32", "gpio51", "gpio52",
-                               "gpio59", "gpio60", "gpio61",
-                               "gpio62" , "gpio66";
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
+                       pins = "gpio27", "gpio28", "gpio29",
+                              "gpio30", "gpio31", "gpio32",
+                              "gpio51", "gpio52", "gpio59",
+                              "gpio60", "gpio61", "gpio62",
+                              "gpio2", "gpio66";
                };
        };
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index abe712ba3d17841cdeb0691dec72704b94b32699..31354a2f0fea58595c6786e046bdb8160da55eb7 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -124,15 +124,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33",
@@ -168,25 +159,6 @@
                };
        };
 
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        usb0_pwr_en_pin: usb0_pwr_en_pin {
                mux {
                        pins = "gpio25";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index c272f34b2cba7fd1e8b58ec669c910c2a20b6946..723c75b503c090d0e9a3fa928def50e27ba8ed6b 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -123,15 +123,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@@ -142,51 +133,6 @@
                };
        };
 
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        usb0_pwr_en_pins: usb0_pwr_en_pins {
                mux {
                        pins = "gpio15";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
index d003a8a5d30527fff43db315ffbd1481c778b78f..2e50cca56ab26a7fc5aef60a9820055642435be9 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
@@ -25,30 +25,6 @@
 };
 
 &qcom_pinmux {
-       i2c4_pins: i2c4_pinmux {
-               pins = "gpio12", "gpio13";
-               function = "gsbi4";
-               bias-disable;
-       };
-
-       spi_pins: spi_pins {
-               mux {
-                       pins = "gpio18", "gpio19", "gpio21";
-                       function = "gsbi5";
-                       drive-strength = <10>;
-                       bias-none;
-               };
-       };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        rgmii0_pins: rgmii0_pins {
                mux {
                        pins = "gpio2", "gpio66";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 92dbd9b626a757aaf82aa08481380c336d8c2596..0242b5e767cb6b81a680c82fb11466fc323c17ac 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -94,15 +94,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio6", "gpio53", "gpio54";
@@ -111,51 +102,6 @@
                        bias-pull-up;
                };
        };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
 };
 
 &gsbi4 {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 02fbc37b2374b77e6551b103e5e0b66188522bbe..45cd6e0477914a920aa67c15a42633cf5474b809 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -124,15 +124,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@@ -142,51 +133,6 @@
                        bias-pull-up;
                };
        };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
 };
 
 &gsbi4 {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 1fdf99e603461c4b42b3c6f4da6e4859caf7a6bd..dfd71bb4e7791d9b8c1181cd3cff04bd274e3fa9 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -132,15 +132,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@@ -151,51 +142,6 @@
                };
        };
 
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        usb0_pwr_en_pins: usb0_pwr_en_pins {
                mux {
                        pins = "gpio15";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 5e73b533d456a56510c977111db219751cc40191..48d304148048d029a91f1e94d2c540db1dce43fe 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -135,15 +135,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        button_pins: button_pins {
                mux {
                        pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68";
@@ -176,25 +167,6 @@
                        drive-strength = <12>;
                };
        };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
 };
 
 &gsbi4 {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index a9325b446240d02710000f4da54ca4f4429c713d..07909831ed4ff4e680282bdc28528dc5a5dae107 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -347,15 +347,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
@@ -391,25 +382,6 @@
                };
        };
 
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        usb_pwr_en_pins: usb_pwr_en_pins {
                mux {
                        pins = "gpio22";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 8be54804ead2a8c48025c8d3c1c6d36094a5921a..29928312e536a1d8eae07d2ee8555ee90df96e17 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -494,51 +494,6 @@
                        bias-pull-up;
                };
        };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36", "gpio37",
-                              "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42", "gpio43",
-                              "gpio44", "gpio45", "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30",
-                              "gpio31", "gpio32", "gpio51", "gpio52",
-                              "gpio59", "gpio60", "gpio61", "gpio62";
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
 };
 
 &usb3_0 {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index a93a7965834ba1a3e68bf89d12a290b393880cb2..6571aa4b927b09982e3a989fa6a8d65835e4dd5d 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -458,51 +458,6 @@
                };
        };
 
-       mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                              "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                              "gpio43", "gpio44", "gpio45",
-                              "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
-       rgmii2_pins: rgmii2_pins {
-               mux {
-                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                       function = "rgmii2";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-       };
-
        usb_pwr_en_pins: usb_pwr_en_pins {
                mux{
                        pins = "gpio68";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
index f986169a6f5a2be892dc201b0fd2b9f6aca0713d..7a84970a14df5cd3e3c4d1e6a8d9b905d9a6d451 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -704,6 +704,15 @@
                                };
                        };
 
+                       i2c4_pins: i2c4_pinmux {
+                               mux {
+                                       pins = "gpio12", "gpio13";
+                                       function = "gsbi4";
+                                       drive-strength = <12>;
+                                       bias-disable;
+                               };
+                       };
+
                        spi_pins: spi_pins {
                                mux {
                                        pins = "gpio18", "gpio19", "gpio21";
@@ -713,6 +722,53 @@
                                };
                        };
 
+                       nand_pins: nand_pins {
+                               disable {
+                                       pins = "gpio34", "gpio35", "gpio36",
+                                              "gpio37", "gpio38";
+                                       function = "nand";
+                                       drive-strength = <10>;
+                                       bias-disable;
+                               };
+
+                               pullups {
+                                       pins = "gpio39";
+                                       function = "nand";
+                                       drive-strength = <10>;
+                                       bias-pull-up;
+                               };
+
+                               hold {
+                                       pins = "gpio40", "gpio41", "gpio42",
+                                              "gpio43", "gpio44", "gpio45",
+                                              "gpio46", "gpio47";
+                                       function = "nand";
+                                       drive-strength = <10>;
+                                       bias-bus-hold;
+                               };
+                       };
+
+                       mdio0_pins: mdio0_pins {
+                               mux {
+                                       pins = "gpio0", "gpio1";
+                                       function = "mdio";
+                                       drive-strength = <8>;
+                                       bias-disable;
+                               };
+                       };
+
+                       rgmii2_pins: rgmii2_pins {
+                               mux {
+                                       pins = "gpio27", "gpio28", "gpio29",
+                                              "gpio30", "gpio31", "gpio32",
+                                              "gpio51", "gpio52", "gpio59",
+                                              "gpio60", "gpio61", "gpio62";
+                                       function = "rgmii2";
+                                       drive-strength = <8>;
+                                       bias-disable;
+                               };
+                       };
+
                        leds_pins: leds_pins {
                                mux {
                                        pins = "gpio7", "gpio8", "gpio9",

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index a2ee3f8bf7caa8f441143e59fac4502f7f0d6a02..6c21ae5e245340e78853c877f5e42795b777cf60 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -105,15 +105,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio9", "gpio26", "gpio33", "gpio64";
@@ -124,13 +115,6 @@
        };
 
        mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-
                clk {
                        pins = "gpio1";
                        input-disable;
@@ -138,14 +122,6 @@
        };
 
        rgmii2_pins: rgmii2_pins {
-               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;
@@ -153,13 +129,6 @@
        };
 
        spi_pins: spi_pins {
-               mux {
-                       pins = "gpio18", "gpio19", "gpio21";
-                       function = "gsbi5";
-                       drive-strength = <10>;
-                       bias-none;
-               };
-
                cs {
                        pins = "gpio20";
                        drive-strength = <12>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 76834be21fac86d80c4b410803d96740378457c4..611015f191b66b8f4afa5951ded25c2af7daf00b 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -134,15 +134,6 @@
                };
        };
 
-       i2c4_pins: i2c4_pinmux {
-               mux {
-                       pins = "gpio12", "gpio13";
-                       function = "gsbi4";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
        led_pins: led_pins {
                mux {
                        pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
@@ -153,38 +144,7 @@
                };
        };
 
-       nand_pins: nand_pins {
-               disable {
-                       pins = "gpio34", "gpio35", "gpio36",
-                                       "gpio37", "gpio38";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-               pullups {
-                       pins = "gpio39";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-               hold {
-                       pins = "gpio40", "gpio41", "gpio42",
-                                       "gpio43", "gpio44", "gpio45",
-                                       "gpio46", "gpio47";
-                       function = "nand";
-                       drive-strength = <10>;
-                       bias-bus-hold;
-               };
-       };
-
        mdio0_pins: mdio0_pins {
-               mux {
-                       pins = "gpio0", "gpio1";
-                       function = "mdio";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-
                clk {
                        pins = "gpio1";
                        input-disable;
@@ -192,14 +152,6 @@
        };
 
        rgmii2_pins: rgmii2_pins {
-               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;