ramips: use pinmux nodes from dtsi
authorMathias Kresin <dev@kresin.me>
Sat, 18 Nov 2017 21:05:16 +0000 (22:05 +0100)
committerMathias Kresin <dev@kresin.me>
Wed, 22 Nov 2017 07:21:53 +0000 (08:21 +0100)
Use the pinmux nodes from the included dtsi file instead of adding
duplicate nodes.

Signed-off-by: Mathias Kresin <dev@kresin.me>
15 files changed:
target/linux/ramips/dts/ArcherC20.dts
target/linux/ramips/dts/ArcherC50.dts
target/linux/ramips/dts/DCH-M225.dts
target/linux/ramips/dts/DIR-615-H1.dts
target/linux/ramips/dts/DIR-620-D1.dts
target/linux/ramips/dts/DUZUN-DM06.dts
target/linux/ramips/dts/HC5X61.dtsi
target/linux/ramips/dts/MIWIFI-MINI.dts
target/linux/ramips/dts/PSG1218A.dts
target/linux/ramips/dts/WHR-300HP2.dts
target/linux/ramips/dts/WIZFI630A.dts
target/linux/ramips/dts/WL-351.dts
target/linux/ramips/dts/Y1.dtsi
target/linux/ramips/dts/ZBT-APE522II.dts
target/linux/ramips/dts/ZBT-WR8305RT.dts

index ba842d9..f0281c3 100644 (file)
                        ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
 
        ralink,mtd-eeprom = <&radio 0>;
        mtd-mac-address = <&rom 0xf100>;
        mtd-mac-address-increment = <(-2)>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
index e872923..88bd327 100644 (file)
                        ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
 
        ralink,mtd-eeprom = <&radio 0>;
        mtd-mac-address = <&rom 0xf100>;
        mtd-mac-address-increment = <(-2)>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
index 5856036..1aea908 100644 (file)
@@ -90,7 +90,7 @@
        #sound-dai-cells = <0>;
        status = "okay";
        pinctrl-names = "default";
-       pinctrl-0 = <&wm8960_mclk_pins>;
+       pinctrl-0 = <&mdio_refclk_pins>;
 };
 
 &spi0 {
                        ralink,group = "uartf";
                        ralink,function = "gpio i2s";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
-
-               wm8960_mclk_pins: wm8960_mclk {
-                       wm8960_mclk {
-                               ralink,group = "mdio";
-                               ralink,function = "refclk";
-                       };
-               };
        };
 };
 
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
-
index 9e8b86e..7d410f1 100644 (file)
                        ralink,group = "i2c", "jtag", "uartf";
                        ralink,function = "gpio";
                };
-
-               rgmii {
-                       ralink,group = "rgmii";
-                       ralink,function = "rgmii";
-               };
-
-               mdio {
-                       ralink,group = "mdio";
-                       ralink,function = "mdio";
-               };
        };
 };
 
 &ethernet {
        mtd-mac-address = <&factory 0x28>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins &mdio_pins>;
 };
 
 &esw {
index baf17e7..2def8aa 100644 (file)
                        ralink,group = "i2c", "jtag", "uartf";
                        ralink,function = "gpio";
                };
-
-               rgmii {
-                       ralink,group = "rgmii";
-                       ralink,function = "rgmii";
-               };
-
-               mdio {
-                       ralink,group = "mdio";
-                       ralink,function = "mdio";
-               };
        };
 };
 
 &ethernet {
        mtd-mac-address = <&factory 0x4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins &mdio_pins>;
 };
 
 &esw {
index c529b34..b8261a5 100644 (file)
                        ralink,function = "gpio";
                };
        };
-
-       i2s_pins: i2s {
-               i2s {
-                       ralink,group = "i2s";
-                       ralink,function = "i2s";
-               };
-       };
-
-       wm8960_mclk_pins: wm8960_mclk {
-               wm8960_mclk {
-                       ralink,group = "refclk";
-                       ralink,function = "refclk";
-               };
-       };
 };
 
 &gpio1 {
        #sound-dai-cells = <0>;
        status = "okay";
        pinctrl-names = "default";
-       pinctrl-0 = <&i2s_pins>, <&wm8960_mclk_pins>;
+       pinctrl-0 = <&i2s_pins>, <&refclk_pins>;
 };
 
 &sdhci {
index 1a5927d..f0b59ec 100644 (file)
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
                        ralink,group = "uartf", "wled", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
index 9da5673..3da39c5 100644 (file)
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
                        ralink,group = "i2c", "rgmii1";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
index c63af58..d76abc3 100644 (file)
                        ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
 
@@ -45,3 +40,8 @@
        mtd-mac-address = <&factory 0x28>;
        mediatek,portmap = "llllw";
 };
+
+&wmac {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
+};
index f74a0b8..d405686 100644 (file)
                        ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
 
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
index 882086b..86ed197 100644 (file)
 };
 
 &uart {
-       compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-       reg = <0x500 0x100>;
-       resets = <&rstctrl 12>;
-       reset-names = "uart";
-       interrupt-parent = <&intc>;
-       interrupts = <5>;
-       reg-shift = <2>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&uartf_pins>;
        status = "okay";
-};
-
-&uartlite {
-       compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-       reg = <0xc00 0x100>;
-       resets = <&rstctrl 19>;
-       reset-names = "uartl";
-       interrupt-parent = <&intc>;
-       interrupts = <12>;
-       reg-shift = <2>;
        pinctrl-names = "default";
-       pinctrl-0 = <&uartlite_pins>;
+       pinctrl-0 = <&uartf_pins>;
 };
 
 &pinctrl {
                        ralink,function = "gpio";
                };
        };
-
-       uartf_gpio_pins: uartf_gpio {
-               uartf_gpio {
-                       ralink,group = "uartf";
-                       ralink,function = "uartf";
-               };
-       };
-
-       uartlite_pins: uartlite {
-               uart {
-                       ralink,group = "uartlite";
-                       ralink,function = "uartlite";
-               };
-       };
 };
 
 &ethernet {
index e620f10..0dd596c 100644 (file)
                        ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
                        ralink,function = "gpio";
                };
-               rgmii {
-                       ralink,group = "rgmii";
-                       ralink,function = "rgmii";
-               };
        };
 };
 
 &ethernet {
        mtd-mac-address = <&factory 0x4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins>;
 };
 
 &esw {
index 022b679..cc126f0 100644 (file)
@@ -94,6 +94,8 @@
        
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pinctrl {
                        ralink,group = "uartf", "wled", "nd_sd";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
index 45fef66..05d053f 100644 (file)
 
 &wmac {
        ralink,mtd-eeprom = <&factory 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pa_pins>;
 };
 
 &pcie {
                        ralink,group = "wled", "i2c", "uartf", "wdt";
                        ralink,function = "gpio";
                };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
        };
 };
index 11911b9..52cac80 100644 (file)
@@ -94,6 +94,8 @@
 };
 
 &ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
        mtd-mac-address = <&factory 0x4>;
        mediatek,portmap = "llllw";
 };
 
 &pinctrl {
        state_default: pinctrl0 {
-               ephy {
-                       ralink,group = "ephy";
-                       ralink,function = "ephy";
-               };
-
                default {
                        ralink,group = "i2c", "uartf", "spi refclk", "wled";
                        ralink,function = "gpio";