From 8cd1c997079246942680893adbd21d884e131b84 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 17 Sep 2013 21:45:44 +0000 Subject: ralink: add pinctrl driver Signed-off-by: John Crispin SVN-Revision: 38026 --- target/linux/ramips/dts/3G-6200N.dts | 25 +++------- target/linux/ramips/dts/3G-6200NL.dts | 25 +++------- target/linux/ramips/dts/3G300M.dts | 29 ++++------- target/linux/ramips/dts/AIR3GII.dts | 20 +++----- target/linux/ramips/dts/ALL0239-3G.dts | 25 +++------- target/linux/ramips/dts/ALL0256N-4M.dts | 20 +++----- target/linux/ramips/dts/ALL0256N-8M.dts | 20 +++----- target/linux/ramips/dts/ALL5002.dts | 21 +++----- target/linux/ramips/dts/ALL5003.dts | 21 +++----- target/linux/ramips/dts/ARGUS_ATP52B.dts | 25 +++------- target/linux/ramips/dts/ASL26555-16M.dts | 21 +++----- target/linux/ramips/dts/ASL26555-8M.dts | 21 +++----- target/linux/ramips/dts/AWM002-4M.dtsi | 1 - target/linux/ramips/dts/AWM002-8M.dtsi | 1 - target/linux/ramips/dts/AWM002.dtsi | 25 +++------- target/linux/ramips/dts/BC2.dts | 26 +++------- target/linux/ramips/dts/BR-6425.dts | 25 +++------- target/linux/ramips/dts/BROADWAY.dts | 25 +++------- target/linux/ramips/dts/CARAMBOLA.dts | 26 +++------- target/linux/ramips/dts/D105.dts | 26 +++------- target/linux/ramips/dts/DAP-1350.dts | 25 +++------- target/linux/ramips/dts/DIR-300-B1.dts | 25 +++------- target/linux/ramips/dts/DIR-600-B1.dts | 24 +++------- target/linux/ramips/dts/DIR-600-B2.dts | 24 +++------- target/linux/ramips/dts/DIR-610-A1.dts | 27 ++++------- target/linux/ramips/dts/DIR-615-D.dts | 25 +++------- target/linux/ramips/dts/DIR-615-H1.dts | 32 ++++++------- target/linux/ramips/dts/DIR-620-A1.dts | 25 +++------- target/linux/ramips/dts/DIR-620-D1.dts | 33 ++++++------- target/linux/ramips/dts/DIR-645.dts | 28 ++++------- target/linux/ramips/dts/DIR-810L.dts | 24 ++++------ target/linux/ramips/dts/ESR-9753.dts | 25 +++------- target/linux/ramips/dts/F5D8235_V1.dts | 16 ++++--- target/linux/ramips/dts/F5D8235_V2.dts | 26 +++------- target/linux/ramips/dts/F7C027.dts | 20 +++----- target/linux/ramips/dts/FONERA20N.dts | 25 +++------- target/linux/ramips/dts/FREESTATION5.dts | 24 +++------- target/linux/ramips/dts/HG255D.dts | 24 +++------- target/linux/ramips/dts/HW550-3G.dts | 26 +++------- target/linux/ramips/dts/IP2202.dts | 27 +++-------- target/linux/ramips/dts/M3.dts | 22 +++------ target/linux/ramips/dts/M4-4M.dts | 26 +++------- target/linux/ramips/dts/M4-8M.dts | 21 +++----- target/linux/ramips/dts/MOFI3500-3GN.dts | 22 +++------ target/linux/ramips/dts/MPRA1.dts | 25 +++------- target/linux/ramips/dts/MPRA2.dts | 25 +++------- target/linux/ramips/dts/MT7620a.dts | 24 +++++----- target/linux/ramips/dts/MT7620a_MT7610e.dts | 7 +-- target/linux/ramips/dts/MZK-W300NH2.dts | 25 +++------- target/linux/ramips/dts/NBG-419N.dts | 24 +++------- target/linux/ramips/dts/NW718.dts | 25 +++------- target/linux/ramips/dts/OMNI-EMB-HPM.dts | 30 ++++-------- target/linux/ramips/dts/OMNI-EMB.dts | 24 +++------- target/linux/ramips/dts/PSR-680W.dts | 25 +++------- target/linux/ramips/dts/PWH2004.dts | 25 +++------- target/linux/ramips/dts/RP-N53.dts | 28 +++++------ target/linux/ramips/dts/RT-G32-B1.dts | 24 +++------- target/linux/ramips/dts/RT-N10-PLUS.dts | 21 -------- target/linux/ramips/dts/RT-N13U.dts | 24 +++------- target/linux/ramips/dts/RT-N15.dts | 4 -- target/linux/ramips/dts/RTN56U.dts | 35 +++++++------- target/linux/ramips/dts/SL-R7205.dts | 24 +++------- target/linux/ramips/dts/TEW-691GR.dts | 25 ++++------ target/linux/ramips/dts/TEW-692GR.dts | 33 ++++++------- target/linux/ramips/dts/UR-326N4G.dts | 25 +++------- target/linux/ramips/dts/UR-336UN.dts | 25 +++------- target/linux/ramips/dts/V11STFE.dts | 4 -- target/linux/ramips/dts/V22RW-2X2.dts | 24 +++------- target/linux/ramips/dts/W150M.dts | 24 +++------- target/linux/ramips/dts/W306R_V20.dts | 24 +++------- target/linux/ramips/dts/W502U.dts | 24 +++------- target/linux/ramips/dts/WCR150GN.dts | 24 +++------- target/linux/ramips/dts/WHR-G300N.dts | 24 +++------- target/linux/ramips/dts/WL-351.dts | 26 +++------- target/linux/ramips/dts/WL341V3.dts | 26 +++------- target/linux/ramips/dts/WLI-TX4-AG300N.dts | 4 -- target/linux/ramips/dts/WL_330N.dts | 24 +++------- target/linux/ramips/dts/WL_330N3G.dts | 24 +++------- target/linux/ramips/dts/WNCE2001.dts | 28 +++-------- target/linux/ramips/dts/WR512-3GN-4M.dts | 25 +++------- target/linux/ramips/dts/WR512-3GN-8M.dts | 25 +++------- target/linux/ramips/dts/WR6202.dts | 25 +++------- target/linux/ramips/dts/X5.dts | 22 +++------ target/linux/ramips/dts/X8.dts | 22 +++------ target/linux/ramips/dts/XDXRN502J.dts | 25 +++------- target/linux/ramips/dts/mt7620a.dtsi | 74 ++++++++++++++++++++++++++--- target/linux/ramips/dts/rt3050.dtsi | 41 ++++++++++++---- target/linux/ramips/dts/rt3352.dtsi | 37 +++++++++++---- target/linux/ramips/dts/rt3883.dtsi | 35 +++++++++++--- target/linux/ramips/dts/rt5350.dtsi | 52 ++++++++++++++++---- 90 files changed, 771 insertions(+), 1443 deletions(-) (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/3G-6200N.dts index 9f600276e6..dc342439ce 100644 --- a/target/linux/ramips/dts/3G-6200N.dts +++ b/target/linux/ramips/dts/3G-6200N.dts @@ -6,17 +6,13 @@ compatible = "3G-6200N", "ralink,rt3050-soc"; model = "Edimax 3g-6200n"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -58,12 +54,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -100,10 +91,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts index 0dca09874d..265806154a 100644 --- a/target/linux/ramips/dts/3G-6200NL.dts +++ b/target/linux/ramips/dts/3G-6200NL.dts @@ -6,17 +6,13 @@ compatible = "3G-6200N", "ralink,rt3050-soc"; model = "Edimax 3g-6200n"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -58,12 +54,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -87,10 +78,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts index c4d6a5d7d0..62683cc16d 100644 --- a/target/linux/ramips/dts/3G300M.dts +++ b/target/linux/ramips/dts/3G300M.dts @@ -7,17 +7,6 @@ model = "Tenda 3G300M"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,6 +43,15 @@ }; }; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; + }; + gpio-leds { compatible = "gpio-leds"; 3grouter { @@ -99,19 +97,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts index f375a7450b..f9fcf075e3 100644 --- a/target/linux/ramips/dts/AIR3GII.dts +++ b/target/linux/ramips/dts/AIR3GII.dts @@ -7,12 +7,6 @@ model = "AirLive Air3GII"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -53,12 +47,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -85,8 +83,4 @@ linux,code = <0x211>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/ALL0239-3G.dts b/target/linux/ramips/dts/ALL0239-3G.dts index 023ccd2fa1..335aea85b3 100644 --- a/target/linux/ramips/dts/ALL0239-3G.dts +++ b/target/linux/ramips/dts/ALL0239-3G.dts @@ -6,18 +6,13 @@ compatible = "ALL0239-3G", "ralink,rt3052-soc"; model = "Allnet ALL0239-3G"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -53,10 +48,6 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { status = "okay"; ralink,portmap = <0x3e>; @@ -104,10 +95,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/ALL0256N-4M.dts index 58248833cd..7351675b65 100644 --- a/target/linux/ramips/dts/ALL0256N-4M.dts +++ b/target/linux/ramips/dts/ALL0256N-4M.dts @@ -7,12 +7,6 @@ model = "Allnet ALL0256N"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -53,12 +47,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; @@ -89,8 +87,4 @@ linux,code = <0x198>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/ALL0256N-8M.dts index 974a4bd465..8c825a9154 100644 --- a/target/linux/ramips/dts/ALL0256N-8M.dts +++ b/target/linux/ramips/dts/ALL0256N-8M.dts @@ -7,12 +7,6 @@ model = "Allnet ALL0256N"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -53,12 +47,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; @@ -89,8 +87,4 @@ linux,code = <0x198>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts index 636b74c746..60c9c1fc44 100644 --- a/target/linux/ramips/dts/ALL5002.dts +++ b/target/linux/ramips/dts/ALL5002.dts @@ -7,13 +7,6 @@ model = "Allnet ALL5002"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "i2c"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -54,19 +47,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts index b1f28ce61b..d599e71efc 100644 --- a/target/linux/ramips/dts/ALL5003.dts +++ b/target/linux/ramips/dts/ALL5003.dts @@ -7,13 +7,6 @@ model = "Allnet ALL5003"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "i2c"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -54,19 +47,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/ARGUS_ATP52B.dts b/target/linux/ramips/dts/ARGUS_ATP52B.dts index b5c94a5f34..b8e246bb03 100644 --- a/target/linux/ramips/dts/ARGUS_ATP52B.dts +++ b/target/linux/ramips/dts/ARGUS_ATP52B.dts @@ -6,17 +6,13 @@ compatible = "ARGUS_ATP52B", "ralink,rt3052-soc"; model = "Argus ATP-52B"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -79,19 +75,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts index e9477b47d0..8bc98df160 100644 --- a/target/linux/ramips/dts/ASL26555-16M.dts +++ b/target/linux/ramips/dts/ASL26555-16M.dts @@ -7,13 +7,6 @@ model = "Alpha ASL26555"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "mdio", "uartlite", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -66,19 +59,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x1e>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/ASL26555-8M.dts index 0a403c195c..f1501ebf11 100644 --- a/target/linux/ramips/dts/ASL26555-8M.dts +++ b/target/linux/ramips/dts/ASL26555-8M.dts @@ -7,13 +7,6 @@ model = "Alpha ASL26555"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "mdio", "uartlite", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; @@ -61,19 +54,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x1e>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/AWM002-4M.dtsi b/target/linux/ramips/dts/AWM002-4M.dtsi index 614b9984d8..2f6a01728f 100644 --- a/target/linux/ramips/dts/AWM002-4M.dtsi +++ b/target/linux/ramips/dts/AWM002-4M.dtsi @@ -5,7 +5,6 @@ model = "AsiaRF AWM002"; palmbus@10000000 { - spi@b00 { m25p80@0 { compatible = "mx25l3205d"; diff --git a/target/linux/ramips/dts/AWM002-8M.dtsi b/target/linux/ramips/dts/AWM002-8M.dtsi index a72ca95d07..d8e4c28690 100644 --- a/target/linux/ramips/dts/AWM002-8M.dtsi +++ b/target/linux/ramips/dts/AWM002-8M.dtsi @@ -5,7 +5,6 @@ model = "AsiaRF AWM002"; palmbus@10000000 { - spi@b00 { m25p80@0 { compatible = "mx25l6405d"; diff --git a/target/linux/ramips/dts/AWM002.dtsi b/target/linux/ramips/dts/AWM002.dtsi index 671dcff05a..e1579b540a 100644 --- a/target/linux/ramips/dts/AWM002.dtsi +++ b/target/linux/ramips/dts/AWM002.dtsi @@ -5,17 +5,6 @@ model = "AsiaRF AWM002"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "i2c"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -50,19 +39,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/BC2.dts b/target/linux/ramips/dts/BC2.dts index 8b97169ace..8877743d98 100644 --- a/target/linux/ramips/dts/BC2.dts +++ b/target/linux/ramips/dts/BC2.dts @@ -6,18 +6,13 @@ compatible = "BC2", "ralink,rt3052-soc"; model = "NexAira BC2"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -73,19 +68,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/BR-6425.dts b/target/linux/ramips/dts/BR-6425.dts index 7529b6b6e5..913df051af 100644 --- a/target/linux/ramips/dts/BR-6425.dts +++ b/target/linux/ramips/dts/BR-6425.dts @@ -6,17 +6,13 @@ compatible = "BR-6425", "ralink,rt3052-soc"; model = "Edimax BR-6425"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -29,12 +25,7 @@ #size-cells = <1>; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -66,8 +57,4 @@ linux,code = <0xf7>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/BROADWAY.dts index a24d829a70..3f00ad75be 100644 --- a/target/linux/ramips/dts/BROADWAY.dts +++ b/target/linux/ramips/dts/BROADWAY.dts @@ -6,17 +6,13 @@ compatible = "BROADWAY", "ralink,rt3052-soc"; model = "Hauppauge Broadway"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -85,10 +76,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/CARAMBOLA.dts b/target/linux/ramips/dts/CARAMBOLA.dts index 68048edcf2..5c63e0315a 100644 --- a/target/linux/ramips/dts/CARAMBOLA.dts +++ b/target/linux/ramips/dts/CARAMBOLA.dts @@ -10,18 +10,13 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "spi", "jtag", "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -57,19 +52,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/D105.dts index 9b1df68a1b..c4171c003d 100644 --- a/target/linux/ramips/dts/D105.dts +++ b/target/linux/ramips/dts/D105.dts @@ -6,18 +6,13 @@ compatible = "D105", "ralink,rt3050-soc"; model = "Huawei D105"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -77,19 +72,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts index 4eab53abe5..1fd9e9a7e5 100644 --- a/target/linux/ramips/dts/DAP-1350.dts +++ b/target/linux/ramips/dts/DAP-1350.dts @@ -10,17 +10,13 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -62,12 +58,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -114,10 +105,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts index 0297b8cf92..8efef3c0d9 100644 --- a/target/linux/ramips/dts/DIR-300-B1.dts +++ b/target/linux/ramips/dts/DIR-300-B1.dts @@ -6,17 +6,13 @@ compatible = "DIR-300-B1", "ralink,rt3050-soc"; model = "D-Link DIR-300 B1"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -78,10 +69,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; status { diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts index 5d78538b05..2c75465440 100644 --- a/target/linux/ramips/dts/DIR-600-B1.dts +++ b/target/linux/ramips/dts/DIR-600-B1.dts @@ -6,15 +6,12 @@ compatible = "DIR-600-B1", "ralink,rt3050-soc"; model = "D-Link DIR-600 B1"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -51,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -77,10 +69,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; status { diff --git a/target/linux/ramips/dts/DIR-600-B2.dts b/target/linux/ramips/dts/DIR-600-B2.dts index ff15ac8439..f982ae0db7 100644 --- a/target/linux/ramips/dts/DIR-600-B2.dts +++ b/target/linux/ramips/dts/DIR-600-B2.dts @@ -6,15 +6,12 @@ compatible = "DIR-600-B2", "ralink,rt3050-soc"; model = "D-Link DIR-600 B2"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -51,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -77,10 +69,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; status { diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts index ed5606af89..26caf5f67f 100644 --- a/target/linux/ramips/dts/DIR-610-A1.dts +++ b/target/linux/ramips/dts/DIR-610-A1.dts @@ -7,16 +7,6 @@ model = "D-Link DIR-610 A1"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "jtag", "uartlite", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,14 +43,21 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x1f>; ralink,led-polarity = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&phy_led_pins>; }; gpio-leds { @@ -93,8 +90,4 @@ }; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts index 21de0e8cc8..b27bca061b 100644 --- a/target/linux/ramips/dts/DIR-615-D.dts +++ b/target/linux/ramips/dts/DIR-615-D.dts @@ -6,17 +6,13 @@ compatible = "DIR-615-D", "ralink,rt3050-soc"; model = "D-Link DIR-615 D"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -78,10 +69,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; status { diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts index 15adcfe72f..5cb2beb3e8 100644 --- a/target/linux/ramips/dts/DIR-615-H1.dts +++ b/target/linux/ramips/dts/DIR-615-H1.dts @@ -7,16 +7,6 @@ model = "D-Link DIR-615 H1"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,24 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + rgmii { + ralink,group = "rgmii"; + ralink,function = "rgmii"; + }; + mdio { + ralink,group = "mdio"; + ralink,function = "mdio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -102,8 +104,4 @@ linux,code = <0x211>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/DIR-620-A1.dts b/target/linux/ramips/dts/DIR-620-A1.dts index 87292246e7..649b3abcc1 100644 --- a/target/linux/ramips/dts/DIR-620-A1.dts +++ b/target/linux/ramips/dts/DIR-620-A1.dts @@ -6,17 +6,13 @@ compatible = "DIR-620-A1", "ralink,rt3050-soc"; model = "D-Link DIR-620 A1"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -78,10 +69,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; status { diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts index c1df99d549..71d3ec2bfd 100644 --- a/target/linux/ramips/dts/DIR-620-D1.dts +++ b/target/linux/ramips/dts/DIR-620-D1.dts @@ -7,17 +7,6 @@ model = "D-Link DIR-620 D1"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,12 +43,24 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + rgmii { + ralink,group = "rgmii"; + ralink,function = "rgmii"; + }; + mdio { + ralink,group = "mdio"; + ralink,function = "mdio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -87,10 +88,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts index e5ccb40ec6..938055c8c9 100644 --- a/target/linux/ramips/dts/DIR-645.dts +++ b/target/linux/ramips/dts/DIR-645.dts @@ -7,21 +7,6 @@ model = "D-Link DIR-645"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "spi"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - timer@100 { - status = "okay"; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - gpio1: gpio@638 { status = "okay"; }; @@ -68,18 +53,23 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; + }; + ethernet@10100000 { mtd-mac-address = <&factory 0x28>; port@0 { ralink,fixed-link = <1000 1 1 0>; }; - }; wmac@10180000 { - status = "okay"; ralink,5ghz = <0>; }; diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts index 193771b5a6..6da0976c2b 100644 --- a/target/linux/ramips/dts/DIR-810L.dts +++ b/target/linux/ramips/dts/DIR-810L.dts @@ -7,17 +7,6 @@ model = "D-Link DIR-810L"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "ephy"; - ralink,gpiomux = "jtag", "mdio", "rgmii1", "rgmii1", "i2c", "wled"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; @@ -79,13 +68,20 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "jtag", "mdio", "rgmii1", "rgmii1", "i2c", "wled", "uartf"; + ralink,function = "gpio"; + }; + }; }; gsw@10110000 { - status = "okay"; ralink,port4 = "ephy"; + + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; }; pcie@10140000 { diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/ESR-9753.dts index 5c5f0bbbe8..755196b55b 100644 --- a/target/linux/ramips/dts/ESR-9753.dts +++ b/target/linux/ramips/dts/ESR-9753.dts @@ -6,17 +6,13 @@ compatible = "ESR-9753", "ralink,rt3052-soc"; model = "Senao / EnGenius ESR-9753"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -81,16 +77,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts index 52b789b76c..36026c2326 100644 --- a/target/linux/ramips/dts/F5D8235_V1.dts +++ b/target/linux/ramips/dts/F5D8235_V1.dts @@ -9,18 +9,20 @@ model = "Belkin F5D8235 v1"; palmbus@300000 { - sysc@0 { - ralink,pinmux = "uartlite"; - ralink,gpiomux = "i2c"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - gpio0: gpio@600 { status = "okay"; }; }; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; + }; + cfi@1f000000 { compatible = "cfi-flash"; reg = <0x1f000000 0x800000>; diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts index 10b8037810..237709f5e4 100644 --- a/target/linux/ramips/dts/F5D8235_V2.dts +++ b/target/linux/ramips/dts/F5D8235_V2.dts @@ -6,18 +6,13 @@ compatible = "F5D8235_V2", "ralink,rt3052-soc"; model = "Belkin F5D8235 v2"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "spi", "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -51,19 +46,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts index 91d4383812..ea716257ef 100644 --- a/target/linux/ramips/dts/F7C027.dts +++ b/target/linux/ramips/dts/F7C027.dts @@ -7,16 +7,6 @@ model = "Belkin F7C027"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "sdram"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -78,9 +68,13 @@ }; }; - - wmac@10180000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; gpio-leds { diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts index 38007a7bc9..31e087b5fc 100644 --- a/target/linux/ramips/dts/FONERA20N.dts +++ b/target/linux/ramips/dts/FONERA20N.dts @@ -6,17 +6,13 @@ compatible = "FONERA20N", "ralink,rt3052-soc"; model = "La Fonera 2.0N"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -85,12 +81,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; port@0 { @@ -120,10 +111,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts index a3cc8fc97d..0ec390c4c8 100644 --- a/target/linux/ramips/dts/FREESTATION5.dts +++ b/target/linux/ramips/dts/FREESTATION5.dts @@ -10,15 +10,12 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -55,19 +52,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x01>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/HG255D.dts index 7ecb4f36df..09d7a45105 100644 --- a/target/linux/ramips/dts/HG255D.dts +++ b/target/linux/ramips/dts/HG255D.dts @@ -6,15 +6,12 @@ compatible = "HG255D", "ralink,rt3052-soc"; model = "HuaWei HG255D"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -107,19 +104,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts index 80adb0af39..d107b55396 100644 --- a/target/linux/ramips/dts/HW550-3G.dts +++ b/target/linux/ramips/dts/HW550-3G.dts @@ -6,18 +6,13 @@ compatible = "HW550-3G", "ralink,rt3052-soc"; model = "Aztech HW550-3G"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -53,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -104,10 +94,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/IP2202.dts index ea9f1702e6..ea5dc780a3 100644 --- a/target/linux/ramips/dts/IP2202.dts +++ b/target/linux/ramips/dts/IP2202.dts @@ -6,18 +6,13 @@ compatible = "IP2202", "ralink,rt3052-soc"; model = "Poray IP2202"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -53,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -86,11 +76,6 @@ }; }; - wmac@10180000 { - status = "okay"; - ralink,led-polarity = <0>; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/M3.dts index 3e391b3d62..bae84ce4bf 100644 --- a/target/linux/ramips/dts/M3.dts +++ b/target/linux/ramips/dts/M3.dts @@ -7,17 +7,6 @@ model = "Poray M3"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; ralink,led_polarity = <1>; }; @@ -91,7 +84,6 @@ }; wmac@10180000 { - status = "okay"; ralink,mtd-eeprom = <&factory 0>; ralink,led-polarity = <1>; }; diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts index 86bd8327c1..4522fb8019 100644 --- a/target/linux/ramips/dts/M4-4M.dts +++ b/target/linux/ramips/dts/M4-4M.dts @@ -7,16 +7,6 @@ model = "Poray M4"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; ralink,led_polarity = <1>; }; @@ -83,12 +77,6 @@ }; }; - wmac@10180000 { - status = "okay"; - ralink,mtd-eeprom = <&factory 0>; - ralink,led-polarity = <1>; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts index d07eb4978a..c8e7ff51ff 100644 --- a/target/linux/ramips/dts/M4-8M.dts +++ b/target/linux/ramips/dts/M4-8M.dts @@ -7,16 +7,6 @@ model = "Poray M4"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; ralink,led_polarity = <1>; }; @@ -84,7 +78,6 @@ }; wmac@10180000 { - status = "okay"; ralink,mtd-eeprom = <&factory 0>; ralink,led-polarity = <1>; }; diff --git a/target/linux/ramips/dts/MOFI3500-3GN.dts b/target/linux/ramips/dts/MOFI3500-3GN.dts index 80cd727463..058b7a27a3 100644 --- a/target/linux/ramips/dts/MOFI3500-3GN.dts +++ b/target/linux/ramips/dts/MOFI3500-3GN.dts @@ -6,18 +6,13 @@ compatible = "MOFI3500-3GN", "ralink,rt3052-soc"; model = "MoFi Network MOFI3500-3GN"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -53,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts index 44363ef616..f363a573f5 100644 --- a/target/linux/ramips/dts/MPRA1.dts +++ b/target/linux/ramips/dts/MPRA1.dts @@ -7,17 +7,6 @@ model = "HAME MPR-A1"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "sdram"; - ralink,gpiomux = "jtag", "i2c", "mdio", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,19 +43,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts index b9bfdc8d4d..00c5d112e3 100644 --- a/target/linux/ramips/dts/MPRA2.dts +++ b/target/linux/ramips/dts/MPRA2.dts @@ -7,17 +7,6 @@ model = "HAME MPR-A2"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,19 +43,19 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts index 417370080d..a14d682912 100644 --- a/target/linux/ramips/dts/MT7620a.dts +++ b/target/linux/ramips/dts/MT7620a.dts @@ -7,17 +7,6 @@ model = "Ralink MT7620a + MT7610e evaluation board"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "mdio", "wled", "ephy", "rgmii1", "rgmii2"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; @@ -55,6 +44,15 @@ }; }; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "jtag", "mdio", "rgmii1", "rgmii1", "i2c", "uartf"; + ralink,function = "gpio"; + }; + }; + }; + ethernet@10100000 { status = "okay"; @@ -88,8 +86,10 @@ }; gsw@10110000 { - status = "okay"; ralink,port4 = "gmac"; + + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; }; sdhci@10130000 { diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts index 03b8043dd1..4ff8747562 100644 --- a/target/linux/ramips/dts/MT7620a_MT7610e.dts +++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts @@ -6,10 +6,8 @@ compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc"; model = "Ralink MT7620A evaluation board"; - palmbus@10000000 { sysc@0 { - ralink,pinmux = "spi", "uartlite", "mdio", "wled", "ephy", "rgmii1", "rgmii2"; ralink,gpiomux = "i2c", "jtag"; ralink,uartmux = "gpio"; ralink,wdtmux = <1>; @@ -28,7 +26,7 @@ compatible = "en25q64"; reg = <0 0>; linux,modalias = "m25p80", "en25q64"; - spi-max-frequency = <10000000>; + spi-max-frequency = <1000000>; partition@0 { label = "u-boot"; @@ -58,6 +56,9 @@ ethernet@10100000 { status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; }; gsw@10110000 { diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts index 29032b450f..78c120a5bf 100644 --- a/target/linux/ramips/dts/MZK-W300NH2.dts +++ b/target/linux/ramips/dts/MZK-W300NH2.dts @@ -6,16 +6,12 @@ compatible = "MZK-W300NH2", "ralink,rt3052-soc"; model = "Planex MZK-W300NH2"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "spi", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -58,12 +54,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -104,8 +95,4 @@ linux,code = <0x100>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/NBG-419N.dts index 6948120058..c7d66c410e 100644 --- a/target/linux/ramips/dts/NBG-419N.dts +++ b/target/linux/ramips/dts/NBG-419N.dts @@ -6,15 +6,12 @@ compatible = "NBG-419N", "ralink,rt3052-soc"; model = "ZyXEL NBG-419N"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -51,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -88,8 +80,4 @@ linux,code = <0x211>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/NW718.dts index 78ad1d63a8..d55f226785 100644 --- a/target/linux/ramips/dts/NW718.dts +++ b/target/linux/ramips/dts/NW718.dts @@ -7,17 +7,6 @@ model = "Netcore NW718"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "i2c"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -96,10 +89,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/OMNI-EMB-HPM.dts b/target/linux/ramips/dts/OMNI-EMB-HPM.dts index 8148294893..9bceb00128 100644 --- a/target/linux/ramips/dts/OMNI-EMB-HPM.dts +++ b/target/linux/ramips/dts/OMNI-EMB-HPM.dts @@ -11,21 +11,6 @@ }; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "spi"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - timer@100 { - status = "okay"; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; @@ -63,9 +48,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; + }; + ethernet@10100000 { phy-handle = <&phy0>; phy-mode = "rgmii"; @@ -78,10 +70,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - ehci@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/OMNI-EMB.dts b/target/linux/ramips/dts/OMNI-EMB.dts index 704a5a1665..146e79b245 100644 --- a/target/linux/ramips/dts/OMNI-EMB.dts +++ b/target/linux/ramips/dts/OMNI-EMB.dts @@ -6,15 +6,12 @@ compatible = "OMNI-EMB", "ralink,rt3052-soc"; model = "Omnima MiniEMBWiFi"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -75,19 +72,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/PSR-680W.dts b/target/linux/ramips/dts/PSR-680W.dts index f91eb2fe7f..ec06feee0c 100644 --- a/target/linux/ramips/dts/PSR-680W.dts +++ b/target/linux/ramips/dts/PSR-680W.dts @@ -10,16 +10,12 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "uartlite", "sdram"; - ralink,gpiomux = "spi", "jtag", "mdio", "rgmii"; - ralink,uartmux = "i2s uartf"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -56,12 +52,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -85,10 +76,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/PWH2004.dts b/target/linux/ramips/dts/PWH2004.dts index d526e836db..bee5e0f266 100644 --- a/target/linux/ramips/dts/PWH2004.dts +++ b/target/linux/ramips/dts/PWH2004.dts @@ -6,17 +6,13 @@ compatible = "PWH2004", "ralink,rt3052-soc"; model = "Prolink PWH2004"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -76,16 +72,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts index c1de105423..e13c3af194 100644 --- a/target/linux/ramips/dts/RP-N53.dts +++ b/target/linux/ramips/dts/RP-N53.dts @@ -7,17 +7,6 @@ model = "Asus RP-N53"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "wled", "ephy", "i2c"; - ralink,gpiomux = "jtag", "mdio", "rgmii1", "rgmii1"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - gpio1: gpio@638 { status = "okay"; }; @@ -63,17 +52,24 @@ }; }; - codec { - compatible = "ralink,mt7620-audio"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "jtag", "mdio", "rgmii1", "rgmii1", "i2c", "uartf"; + ralink,function = "gpio"; + }; + }; }; - ethernet@10100000 { - status = "okay"; + codec { + compatible = "ralink,mt7620-audio"; }; gsw@10110000 { - status = "okay"; ralink,port4 = "ephy"; + + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; }; pcie@10140000 { diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts index c03a7ba5b7..86abc9ca66 100644 --- a/target/linux/ramips/dts/RT-G32-B1.dts +++ b/target/linux/ramips/dts/RT-G32-B1.dts @@ -7,16 +7,6 @@ model = "Asus RT-G32 B1"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -78,8 +72,4 @@ linux,code = <0x211>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/RT-N10-PLUS.dts index 2f070b7419..0606ccb245 100644 --- a/target/linux/ramips/dts/RT-N10-PLUS.dts +++ b/target/linux/ramips/dts/RT-N10-PLUS.dts @@ -6,18 +6,6 @@ compatible = "RT-N10-PLUS", "ralink,rt3050-soc"; model = "Asus RT-N10+"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; - cfi@1f000000 { compatible = "cfi-flash"; reg = <0x1f000000 0x800000>; @@ -51,12 +39,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -84,8 +67,4 @@ linux,code = <0x211>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/RT-N13U.dts index 2e1a62cdc2..b6a649ccdb 100644 --- a/target/linux/ramips/dts/RT-N13U.dts +++ b/target/linux/ramips/dts/RT-N13U.dts @@ -6,15 +6,12 @@ compatible = "RT-N13U", "ralink,rt3052-soc"; model = "Asus RT-N13U"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -85,19 +82,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts index 8351449ea1..0b9d0d9f54 100644 --- a/target/linux/ramips/dts/RT-N15.dts +++ b/target/linux/ramips/dts/RT-N15.dts @@ -59,10 +59,6 @@ }; }; - wmac@480000 { - status = "okay"; - }; - rtl8366s { compatible = "realtek,rtl8366s"; gpio-sda = <&gpio0 1 0>; diff --git a/target/linux/ramips/dts/RTN56U.dts b/target/linux/ramips/dts/RTN56U.dts index 9c36af5721..6dfe3f480d 100644 --- a/target/linux/ramips/dts/RTN56U.dts +++ b/target/linux/ramips/dts/RTN56U.dts @@ -7,30 +7,21 @@ model = "Asus RT-N56U"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,pcimux = "pci-fnc"; - ralink,wdtmux = <0>; - }; - - timer@100 { - status = "okay"; - }; - - gpio0: gpio@600 { + gpio1: gpio@638 { status = "okay"; }; + }; - gpio1: gpio@638 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; }; }; ethernet@10100000 { - status = "okay"; - port@0 { ralink,fixed-link = <1000 1 1 1>; }; @@ -39,6 +30,15 @@ pci@10140000 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pci_pins>; + pci_pins: pci { + pci { + ralink,group = "pci"; + ralink,function = "pci-fnc"; + }; + }; + host-bridge { pci-bridge@1 { status = "okay"; @@ -47,7 +47,6 @@ }; wmac@10180000 { - status = "okay"; ralink,2ghz = <0>; }; diff --git a/target/linux/ramips/dts/SL-R7205.dts b/target/linux/ramips/dts/SL-R7205.dts index 8f1fe851f2..589fd10fa2 100644 --- a/target/linux/ramips/dts/SL-R7205.dts +++ b/target/linux/ramips/dts/SL-R7205.dts @@ -6,15 +6,12 @@ compatible = "SL-R7205", "ralink,rt3052-soc"; model = "Skyline SL-R7205 Wireless 3G Router"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -51,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -85,10 +77,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts index 002719583b..98d45fc530 100644 --- a/target/linux/ramips/dts/TEW-691GR.dts +++ b/target/linux/ramips/dts/TEW-691GR.dts @@ -7,29 +7,21 @@ model = "TRENDnet TEW-691GR"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite"; - ralink,gpiomux = "i2c", "jtag"; - ralink,uartmux = "gpio"; - ralink,pcimux = "pci-fnc"; - ralink,wdtmux = <1>; - }; - - timer@100 { - status = "okay"; - }; - - gpio0: gpio@600 { + gpio1: gpio@638 { status = "okay"; }; + }; - gpio1: gpio@638 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; }; }; ethernet@10100000 { - status = "okay"; port@0 { phy-handle = <&phy0>; phy-mode = "rgmii"; @@ -44,7 +36,6 @@ }; wmac@10180000 { - status = "okay"; ralink,5ghz = <0>; }; diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts index eee4b2af2d..6c07c7760f 100644 --- a/target/linux/ramips/dts/TEW-692GR.dts +++ b/target/linux/ramips/dts/TEW-692GR.dts @@ -7,24 +7,17 @@ model = "TRENDnet TEW-692GR"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite"; - ralink,gpiomux = "i2c", "jtag", "spi"; - ralink,uartmux = "gpio"; - ralink,pcimux = "pci-fnc"; - ralink,wdtmux = <1>; - }; - - timer@100 { - status = "okay"; - }; - - gpio0: gpio@600 { + gpio1: gpio@638 { status = "okay"; }; + }; - gpio1: gpio@638 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -46,6 +39,15 @@ pci@10140000 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pci_pins>; + pci_pins: pci { + pci { + ralink,group = "pci"; + ralink,function = "pci-fnc"; + }; + }; + host-bridge { pci-bridge@1 { status = "okay"; @@ -54,7 +56,6 @@ }; wmac@10180000 { - status = "okay"; ralink,5ghz = <0>; }; diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts index 6bb360d9d7..d97ca05ef9 100644 --- a/target/linux/ramips/dts/UR-326N4G.dts +++ b/target/linux/ramips/dts/UR-326N4G.dts @@ -6,16 +6,12 @@ compatible = "UR-326N4G", "ralink,rt3052-soc"; model = "UR-326N4G Wireless N router"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -102,10 +93,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts index a5c2841214..b1377036cc 100644 --- a/target/linux/ramips/dts/UR-336UN.dts +++ b/target/linux/ramips/dts/UR-336UN.dts @@ -6,16 +6,12 @@ compatible = "UR-336UN", "ralink,rt3052-soc"; model = "UR-336UN Wireless N router"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -29,12 +25,7 @@ #size-cells = <1>; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -79,10 +70,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/V11STFE.dts index 20cbaea49c..54ead081dd 100644 --- a/target/linux/ramips/dts/V11STFE.dts +++ b/target/linux/ramips/dts/V11STFE.dts @@ -24,10 +24,6 @@ status = "okay"; }; - wmac@480000 { - status = "okay"; - }; - pci@10140000 { status = "okay"; diff --git a/target/linux/ramips/dts/V22RW-2X2.dts b/target/linux/ramips/dts/V22RW-2X2.dts index a4f8c3c77f..99e748e78d 100644 --- a/target/linux/ramips/dts/V22RW-2X2.dts +++ b/target/linux/ramips/dts/V22RW-2X2.dts @@ -6,15 +6,12 @@ compatible = "V22RW-2X2", "ralink,rt3052-soc"; model = "Ralink AP-RT3052-V22RW-2X2"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -51,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -89,10 +81,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/W150M.dts index 94f1960641..76ad658437 100644 --- a/target/linux/ramips/dts/W150M.dts +++ b/target/linux/ramips/dts/W150M.dts @@ -6,15 +6,12 @@ compatible = "3G300M", "ralink,rt3050-soc"; model = "Tenda 3G300M"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii", "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -96,16 +93,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/W306R_V20.dts index f5b3414442..16d9ad4c3a 100644 --- a/target/linux/ramips/dts/W306R_V20.dts +++ b/target/linux/ramips/dts/W306R_V20.dts @@ -39,24 +39,16 @@ }; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; - - ethernet@10100000 { - status = "okay"; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -83,8 +75,4 @@ linux,code = <0x198>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts index 89ddc79407..54e8d58ed2 100644 --- a/target/linux/ramips/dts/W502U.dts +++ b/target/linux/ramips/dts/W502U.dts @@ -10,15 +10,12 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -55,12 +52,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -93,10 +85,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts index 380af7d558..601883d24d 100644 --- a/target/linux/ramips/dts/WCR150GN.dts +++ b/target/linux/ramips/dts/WCR150GN.dts @@ -6,15 +6,12 @@ compatible = "WCR150GN", "ralink,rt3052-soc"; model = "Sparklan WCR-150GN"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -80,19 +77,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts index bd18f4cdfb..8cec31e033 100644 --- a/target/linux/ramips/dts/WHR-G300N.dts +++ b/target/linux/ramips/dts/WHR-G300N.dts @@ -6,15 +6,12 @@ compatible = "WHR-G300N", "ralink,rt3052-soc"; model = "Buffalo WHR-G300N"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -28,12 +25,7 @@ #size-cells = <1>; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -79,8 +71,4 @@ linux,code = <0x103>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/WL-351.dts b/target/linux/ramips/dts/WL-351.dts index f9e0595f11..bc122943d4 100644 --- a/target/linux/ramips/dts/WL-351.dts +++ b/target/linux/ramips/dts/WL-351.dts @@ -6,18 +6,13 @@ compatible = "WL-351", "ralink,rt3052-soc"; model = "Sitecom WL-351 v1 002"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "i2c", "spi", "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; cfi@1f000000 { @@ -53,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3f>; ralink,fct2 = <0x0002500c>; /* @@ -70,10 +60,6 @@ ralink,fpa2 = <0x1f003fff>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WL341V3.dts b/target/linux/ramips/dts/WL341V3.dts index 09ef844957..70317c7eee 100644 --- a/target/linux/ramips/dts/WL341V3.dts +++ b/target/linux/ramips/dts/WL341V3.dts @@ -6,18 +6,6 @@ compatible = "WL341V3", "ralink,rt3052-soc"; model = "Sitecom WL-341 v3"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; - cfi@1f000000 { compatible = "cfi-flash"; reg = <0x1f000000 0x800000>; @@ -51,12 +39,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -109,10 +101,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/WLI-TX4-AG300N.dts index 2296c3fc07..62c2a799a6 100644 --- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts +++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts @@ -58,10 +58,6 @@ }; }; - wmac@480000 { - status = "okay"; - }; - gpio-keys-polled { compatible = "gpio-keys-polled"; #address-cells = <1>; diff --git a/target/linux/ramips/dts/WL_330N.dts b/target/linux/ramips/dts/WL_330N.dts index 1063c1eaf8..4fc4368c3f 100644 --- a/target/linux/ramips/dts/WL_330N.dts +++ b/target/linux/ramips/dts/WL_330N.dts @@ -7,16 +7,6 @@ model = "Asus WL-330N"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -90,8 +84,4 @@ linux,code = <0x198>; }; }; - - wmac@10180000 { - status = "okay"; - }; }; diff --git a/target/linux/ramips/dts/WL_330N3G.dts b/target/linux/ramips/dts/WL_330N3G.dts index 83e83fa214..1c88ed31aa 100644 --- a/target/linux/ramips/dts/WL_330N3G.dts +++ b/target/linux/ramips/dts/WL_330N3G.dts @@ -7,16 +7,6 @@ model = "Asus WL-330N3G"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -53,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -95,10 +89,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts index 3e467a7b04..bbf6625bf6 100644 --- a/target/linux/ramips/dts/WNCE2001.dts +++ b/target/linux/ramips/dts/WNCE2001.dts @@ -11,17 +11,6 @@ }; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "spi", "uartlite", "jtag", "sdram"; - ralink,gpiomux = "i2c", "mdio", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -75,16 +64,13 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - - esw@10110000 { - status = "okay"; - }; - - wmac@10180000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; + }; }; gpio-leds { diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts index cef7464d45..fccd04aed9 100644 --- a/target/linux/ramips/dts/WR512-3GN-4M.dts +++ b/target/linux/ramips/dts/WR512-3GN-4M.dts @@ -6,16 +6,12 @@ compatible = "WR512-3GN", "ralink,rt3052-soc"; model = "WR512-3GN-like router"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -102,10 +93,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/WR512-3GN-8M.dts index 9325dbb877..01da52340e 100644 --- a/target/linux/ramips/dts/WR512-3GN-8M.dts +++ b/target/linux/ramips/dts/WR512-3GN-8M.dts @@ -6,16 +6,12 @@ compatible = "WR512-3GN", "ralink,rt3052-soc"; model = "WR512-3GN-like router"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; }; @@ -102,10 +93,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts index a970849e31..ed3e70851d 100644 --- a/target/linux/ramips/dts/WR6202.dts +++ b/target/linux/ramips/dts/WR6202.dts @@ -10,17 +10,13 @@ bootargs = "console=ttyS0,115200"; }; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; - - gpio0: gpio@600 { - status = "okay"; - }; - }; gpio-leds { @@ -85,19 +81,10 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts index d9e963239f..0a4f1b3684 100644 --- a/target/linux/ramips/dts/X5.dts +++ b/target/linux/ramips/dts/X5.dts @@ -7,17 +7,6 @@ model = "Poray X5"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; ralink,led_polarity = <1>; }; @@ -118,7 +111,6 @@ }; wmac@10180000 { - status = "okay"; ralink,mtd-eeprom = <&factory 0>; ralink,led-polarity = <1>; }; diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/X8.dts index e7b13ca63d..b7591dec20 100644 --- a/target/linux/ramips/dts/X8.dts +++ b/target/linux/ramips/dts/X8.dts @@ -7,17 +7,6 @@ model = "Poray X8"; palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii"; - ralink,gpiomux = "jtag"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; - }; - spi@b00 { status = "okay"; m25p80@0 { @@ -54,12 +43,16 @@ }; }; - ethernet@10100000 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; }; esw@10110000 { - status = "okay"; ralink,portmap = <0x2f>; ralink,led_polarity = <1>; }; @@ -85,7 +78,6 @@ }; wmac@10180000 { - status = "okay"; ralink,mtd-eeprom = <&factory 0>; ralink,led-polarity = <1>; }; diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts index 3df097cde7..28670055fd 100644 --- a/target/linux/ramips/dts/XDXRN502J.dts +++ b/target/linux/ramips/dts/XDXRN502J.dts @@ -6,16 +6,12 @@ compatible = "XDXRN502J", "ralink,rt3052-soc"; model = "XDX RN502J"; - palmbus@10000000 { - sysc@0 { - ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "sdram", "rgmii"; - ralink,gpiomux = "mdio"; - ralink,uartmux = "gpio"; - ralink,wdtmux = <1>; - }; - - gpio0: gpio@600 { - status = "okay"; + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; @@ -52,12 +48,7 @@ }; }; - ethernet@10100000 { - status = "okay"; - }; - esw@10110000 { - status = "okay"; ralink,portmap = <0x3e>; }; @@ -85,10 +76,6 @@ }; }; - wmac@10180000 { - status = "okay"; - }; - otg@101c0000 { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 506155bd6f..418258254b 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -110,8 +110,6 @@ ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; - - status = "disabled"; }; gpio1: gpio@638 { @@ -163,6 +161,9 @@ #size-cells = <0>; status = "disabled"; + + pinctrl-names = "default"; + pinctrl-0 = <&i2c_pins>; }; i2s@a00 { @@ -189,6 +190,9 @@ #size-cells = <1>; status = "disabled"; + + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>; }; uartlite@c00 { @@ -202,6 +206,9 @@ interrupts = <12>; reg-shift = <2>; + + pinctrl-names = "default"; + pinctrl-0 = <&uartlite_pins>; }; systick@d00 { @@ -242,6 +249,62 @@ }; }; + pinctrl { + compatible = "ralink,rt2880-pinmux"; + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + state_default: pinctrl0 { + }; + spi_pins: spi { + spi { + ralink,group = "spi"; + ralink,function = "spi"; + }; + }; + i2c_pins: i2c { + i2c { + lantiq,group = "i2c"; + lantiq,function = "i2c"; + }; + }; + uartlite_pins: uartlite { + uart { + ralink,group = "uartlite"; + ralink,function = "uartlite"; + }; + }; + mdio_pins: mdio { + mdio { + ralink,group = "mdio"; + ralink,function = "mdio"; + }; + }; + ephy_pins: ephy { + ephy { + ralink,group = "ephy"; + ralink,function = "ephy"; + }; + }; + wled_pins: wled { + wled { + ralink,group = "wled"; + ralink,function = "wled"; + }; + }; + rgmii1_pins: rgmii1 { + mdio { + ralink,group = "rgmii1"; + ralink,function = "rgmii1"; + }; + }; + rgmii2_pins: rgmii2 { + mdio { + ralink,group = "rgmii2"; + ralink,function = "rgmii2"; + }; + }; + }; + rstctrl: rstctrl { compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset"; #reset-cells = <1>; @@ -264,13 +327,14 @@ interrupt-parent = <&cpuintc>; interrupts = <5>; - status = "disabled"; - mdio-bus { #address-cells = <1>; #size-cells = <0>; status = "disabled"; + + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; }; }; @@ -280,8 +344,6 @@ interrupt-parent = <&intc>; interrupts = <17>; - - status = "disabled"; }; sdhci@10130000 { diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 1130005e78..86a4d15476 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -110,8 +110,6 @@ interrupt-parent = <&intc>; interrupts = <6>; - - status = "disabled"; }; gpio1: gpio@638 { @@ -156,6 +154,9 @@ #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>; + status = "disabled"; }; @@ -170,8 +171,38 @@ interrupts = <12>; reg-shift = <2>; + + pinctrl-names = "default"; + pinctrl-0 = <&uartlite_pins>; + }; + + }; + + pinctrl { + compatible = "ralink,rt2880-pinmux"; + + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinctrl0 { + sdram { + ralink,group = "sdram"; + ralink,function = "sdram"; + }; }; + spi_pins: spi { + spi { + ralink,group = "spi"; + ralink,function = "spi"; + }; + }; + uartlite_pins: uartlite { + uart { + ralink,group = "uartlite"; + ralink,function = "uartlite"; + }; + }; }; rstctrl: rstctrl { @@ -185,8 +216,6 @@ interrupt-parent = <&cpuintc>; interrupts = <5>; - - status = "disabled"; }; esw@10110000 { @@ -195,8 +224,6 @@ interrupt-parent = <&intc>; interrupts = <17>; - - status = "disabled"; }; wmac@10180000 { @@ -207,8 +234,6 @@ interrupts = <6>; ralink,eeprom = "soc_wmac.eeprom"; - - status = "disabled"; }; otg@101c0000 { diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index e4d35d87c2..db38b00e63 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -106,8 +106,6 @@ interrupt-parent = <&intc>; interrupts = <6>; - - status = "disabled"; }; gpio1: gpio@638 { @@ -151,6 +149,9 @@ resets = <&rstctrl 18>; reset-names = "spi"; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>; + status = "disabled"; }; @@ -165,6 +166,32 @@ interrupts = <12>; reg-shift = <2>; + + pinctrl-names = "default"; + pinctrl-0 = <&uartlite_pins>; + }; + }; + + pinctrl { + compatible = "ralink,rt2880-pinmux"; + + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinctrl0 { + }; + + spi_pins: spi { + spi { + ralink,group = "spi"; + ralink,function = "spi"; + }; + }; + uartlite_pins: uartlite { + uart { + ralink,group = "uartlite"; + ralink,function = "uartlite"; + }; }; }; @@ -179,8 +206,6 @@ interrupt-parent = <&cpuintc>; interrupts = <5>; - - status = "disabled"; }; esw@10110000 { @@ -189,8 +214,6 @@ interrupt-parent = <&intc>; interrupts = <17>; - - status = "disabled"; }; wmac@10180000 { @@ -201,8 +224,6 @@ interrupts = <6>; ralink,eeprom = "soc_wmac.eeprom"; - - status = "disabled"; }; ehci@101c0000 { diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index d4387a92d0..15c35612d5 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -114,8 +114,6 @@ ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; - - status = "disabled"; }; gpio1: gpio@638 { @@ -175,6 +173,9 @@ resets = <&rstctrl 18>; reset-names = "spi"; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>; + status = "disabled"; }; @@ -189,6 +190,32 @@ interrupts = <12>; reg-shift = <2>; + + pinctrl-names = "default"; + pinctrl-0 = <&uartlite_pins>; + }; + }; + + pinctrl { + compatible = "ralink,rt2880-pinmux"; + + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + state_default: pinctrl0 { + }; + + spi_pins: spi { + spi { + ralink,group = "spi"; + ralink,function = "spi"; + }; + }; + + uartlite_pins: uartlite { + uart { + ralink,group = "uartlite"; + ralink,function = "uartlite"; + }; }; }; @@ -199,8 +226,6 @@ interrupt-parent = <&cpuintc>; interrupts = <5>; - status = "disabled"; - port@0 { compatible = "ralink,rt3883-port", "ralink,eth-port"; reg = <0>; @@ -320,8 +345,6 @@ interrupts = <6>; ralink,eeprom = "soc_wmac.eeprom"; - - status = "disabled"; }; ehci@101c0000 { diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index e132699da3..cb9077f7b4 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -110,8 +110,6 @@ ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; - - status = "disabled"; }; gpio1: gpio@638 { @@ -162,6 +160,9 @@ #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c_pins>; + status = "disabled"; }; @@ -175,6 +176,9 @@ #address-cells = <1>; #size-cells = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>; + status = "disabled"; }; @@ -188,6 +192,9 @@ interrupt-parent = <&intc>; interrupts = <12>; + pinctrl-names = "default"; + pinctrl-0 = <&uartlite_pins>; + reg-shift = <2>; }; @@ -200,6 +207,41 @@ }; }; + pinctrl { + compatible = "ralink,rt2880-pinmux"; + + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinctrl0 { + }; + + spi_pins: spi { + spi { + ralink,group = "spi"; + ralink,function = "spi"; + }; + }; + i2c_pins: i2c { + i2c { + ralink,group = "i2c"; + ralink,function = "i2c"; + }; + }; + phy_led_pins: phy_led { + phy_led { + ralink,group = "led"; + ralink,function = "led"; + }; + }; + uartlite_pins: uartlite { + uart { + ralink,group = "uartlite"; + ralink,function = "uartlite"; + }; + }; + }; + rstctrl: rstctrl { compatible = "ralink,rt5350-reset", "ralink,rt2880-reset"; #reset-cells = <1>; @@ -218,8 +260,6 @@ interrupt-parent = <&cpuintc>; interrupts = <5>; - - status = "disabled"; }; esw@10110000 { @@ -228,8 +268,6 @@ interrupt-parent = <&intc>; interrupts = <17>; - - status = "disabled"; }; wmac@10180000 { @@ -240,8 +278,6 @@ interrupts = <6>; ralink,eeprom = "soc_wmac.eeprom"; - - status = "disabled"; }; ehci@101c0000 { -- cgit v1.2.3