ramips: use pinmux nodes from dtsi

Use the pinmux nodes from the included dtsi file instead of adding
duplicate nodes.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2017-11-18 22:05:16 +01:00
parent b69ceb0c3d
commit aa82141d9b
15 changed files with 32 additions and 132 deletions

View File

@ -142,11 +142,6 @@
ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt"; ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };
@ -172,6 +167,8 @@
ralink,mtd-eeprom = <&radio 0>; ralink,mtd-eeprom = <&radio 0>;
mtd-mac-address = <&rom 0xf100>; mtd-mac-address = <&rom 0xf100>;
mtd-mac-address-increment = <(-2)>; mtd-mac-address-increment = <(-2)>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pcie { &pcie {

View File

@ -142,11 +142,6 @@
ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd"; ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };
@ -172,6 +167,8 @@
ralink,mtd-eeprom = <&radio 0>; ralink,mtd-eeprom = <&radio 0>;
mtd-mac-address = <&rom 0xf100>; mtd-mac-address = <&rom 0xf100>;
mtd-mac-address-increment = <(-2)>; mtd-mac-address-increment = <(-2)>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pcie { &pcie {

View File

@ -90,7 +90,7 @@
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wm8960_mclk_pins>; pinctrl-0 = <&mdio_refclk_pins>;
}; };
&spi0 { &spi0 {
@ -162,18 +162,6 @@
ralink,group = "uartf"; ralink,group = "uartf";
ralink,function = "gpio i2s"; ralink,function = "gpio i2s";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
wm8960_mclk_pins: wm8960_mclk {
wm8960_mclk {
ralink,group = "mdio";
ralink,function = "refclk";
};
};
}; };
}; };
@ -187,5 +175,6 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };

View File

@ -99,21 +99,13 @@
ralink,group = "i2c", "jtag", "uartf"; ralink,group = "i2c", "jtag", "uartf";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
rgmii {
ralink,group = "rgmii";
ralink,function = "rgmii";
};
mdio {
ralink,group = "mdio";
ralink,function = "mdio";
};
}; };
}; };
&ethernet { &ethernet {
mtd-mac-address = <&factory 0x28>; mtd-mac-address = <&factory 0x28>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins &mdio_pins>;
}; };
&esw { &esw {

View File

@ -78,21 +78,13 @@
ralink,group = "i2c", "jtag", "uartf"; ralink,group = "i2c", "jtag", "uartf";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
rgmii {
ralink,group = "rgmii";
ralink,function = "rgmii";
};
mdio {
ralink,group = "mdio";
ralink,function = "mdio";
};
}; };
}; };
&ethernet { &ethernet {
mtd-mac-address = <&factory 0x4>; mtd-mac-address = <&factory 0x4>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins &mdio_pins>;
}; };
&esw { &esw {

View File

@ -63,20 +63,6 @@
ralink,function = "gpio"; 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 { &gpio1 {
@ -108,7 +94,7 @@
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s_pins>, <&wm8960_mclk_pins>; pinctrl-0 = <&i2s_pins>, <&refclk_pins>;
}; };
&sdhci { &sdhci {

View File

@ -122,6 +122,8 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pcie { &pcie {
@ -134,10 +136,5 @@
ralink,group = "uartf", "wled", "nd_sd"; ralink,group = "uartf", "wled", "nd_sd";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };

View File

@ -125,6 +125,8 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pcie { &pcie {
@ -146,10 +148,5 @@
ralink,group = "i2c", "rgmii1"; ralink,group = "i2c", "rgmii1";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };

View File

@ -31,11 +31,6 @@
ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };
@ -45,3 +40,8 @@
mtd-mac-address = <&factory 0x28>; mtd-mac-address = <&factory 0x28>;
mediatek,portmap = "llllw"; mediatek,portmap = "llllw";
}; };
&wmac {
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
};

View File

@ -127,11 +127,6 @@
ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd"; ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };
@ -147,4 +142,6 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };

View File

@ -118,28 +118,9 @@
}; };
&uart { &uart {
compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; status = "okay";
reg = <0x500 0x100>;
resets = <&rstctrl 12>;
reset-names = "uart";
interrupt-parent = <&intc>;
interrupts = <5>;
reg-shift = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uartf_pins>; 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 { &pinctrl {
@ -149,20 +130,6 @@
ralink,function = "gpio"; 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 { &ethernet {

View File

@ -92,15 +92,13 @@
ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
rgmii {
ralink,group = "rgmii";
ralink,function = "rgmii";
};
}; };
}; };
&ethernet { &ethernet {
mtd-mac-address = <&factory 0x4>; mtd-mac-address = <&factory 0x4>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
}; };
&esw { &esw {

View File

@ -94,6 +94,8 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pinctrl { &pinctrl {
@ -102,10 +104,5 @@
ralink,group = "uartf", "wled", "nd_sd"; ralink,group = "uartf", "wled", "nd_sd";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };

View File

@ -115,6 +115,8 @@
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
}; };
&pcie { &pcie {
@ -136,10 +138,5 @@
ralink,group = "wled", "i2c", "uartf", "wdt"; ralink,group = "wled", "i2c", "uartf", "wdt";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
pa {
ralink,group = "pa";
ralink,function = "pa";
};
}; };
}; };

View File

@ -94,6 +94,8 @@
}; };
&ethernet { &ethernet {
pinctrl-names = "default";
pinctrl-0 = <&ephy_pins>;
mtd-mac-address = <&factory 0x4>; mtd-mac-address = <&factory 0x4>;
mediatek,portmap = "llllw"; mediatek,portmap = "llllw";
}; };
@ -104,11 +106,6 @@
&pinctrl { &pinctrl {
state_default: pinctrl0 { state_default: pinctrl0 {
ephy {
ralink,group = "ephy";
ralink,function = "ephy";
};
default { default {
ralink,group = "i2c", "uartf", "spi refclk", "wled"; ralink,group = "i2c", "uartf", "spi refclk", "wled";
ralink,function = "gpio"; ralink,function = "gpio";