ramips: DTS rework
authorStanislav Galabov <stanislav_galabov@smartcom.bg>
Tue, 10 May 2016 10:41:46 +0000 (13:41 +0300)
committerJohn Crispin <john@phrozen.org>
Thu, 12 May 2016 01:29:35 +0000 (03:29 +0200)
Add node aliases to dtsi files.
Reword dts files so they're more in-line with upstream.
Fix some more warnings and errors reported by dtc

Signed-off-by: Stanislav Galabov <sgalabov@gmail.com>
196 files changed:
target/linux/ramips/dts/3G-6200N.dts
target/linux/ramips/dts/3G-6200NL.dts
target/linux/ramips/dts/3G150B.dts
target/linux/ramips/dts/3G300M.dts
target/linux/ramips/dts/A5-V11.dts
target/linux/ramips/dts/AI-BR100.dts
target/linux/ramips/dts/AIR3GII.dts
target/linux/ramips/dts/ALL0239-3G.dts
target/linux/ramips/dts/ALL0256N-4M.dts
target/linux/ramips/dts/ALL0256N-8M.dts
target/linux/ramips/dts/ALL5002.dts
target/linux/ramips/dts/ALL5003.dts
target/linux/ramips/dts/AR670W.dts
target/linux/ramips/dts/AR725W.dts
target/linux/ramips/dts/ASL26555-16M.dts
target/linux/ramips/dts/ASL26555-8M.dts
target/linux/ramips/dts/ATP-52B.dts
target/linux/ramips/dts/AWAPN2403.dts
target/linux/ramips/dts/AWM002-4M.dtsi
target/linux/ramips/dts/AWM002-8M.dtsi
target/linux/ramips/dts/AWM002-EVB-4M.dts
target/linux/ramips/dts/AWM002-EVB-8M.dts
target/linux/ramips/dts/AWM002.dtsi
target/linux/ramips/dts/AWM003-EVB.dts
target/linux/ramips/dts/ArcherC20i.dts
target/linux/ramips/dts/BC2.dts
target/linux/ramips/dts/BR-6425.dts
target/linux/ramips/dts/BR-6475ND.dts
target/linux/ramips/dts/BROADWAY.dts
target/linux/ramips/dts/CARAMBOLA.dts
target/linux/ramips/dts/CF-WR800N.dts
target/linux/ramips/dts/CS-QR10.dts
target/linux/ramips/dts/CY-SWR1100.dts
target/linux/ramips/dts/D105.dts
target/linux/ramips/dts/DAP-1350.dts
target/linux/ramips/dts/DB-WRT01.dts
target/linux/ramips/dts/DCS-930.dts
target/linux/ramips/dts/DCS-930L-B1.dts
target/linux/ramips/dts/DIR-300-B1.dts
target/linux/ramips/dts/DIR-300-B7.dts
target/linux/ramips/dts/DIR-320-B1.dts
target/linux/ramips/dts/DIR-600-B1.dts
target/linux/ramips/dts/DIR-600-B2.dts
target/linux/ramips/dts/DIR-610-A1.dts
target/linux/ramips/dts/DIR-615-D.dts
target/linux/ramips/dts/DIR-615-H1.dts
target/linux/ramips/dts/DIR-620-A1.dts
target/linux/ramips/dts/DIR-620-D1.dts
target/linux/ramips/dts/DIR-645.dts
target/linux/ramips/dts/DIR-810L.dts
target/linux/ramips/dts/DIR-860L-B1.dts
target/linux/ramips/dts/E1700.dts
target/linux/ramips/dts/ESR-9753.dts
target/linux/ramips/dts/EX2700.dts
target/linux/ramips/dts/F5D8235_V1.dts
target/linux/ramips/dts/F5D8235_V2.dts
target/linux/ramips/dts/F7C027.dts
target/linux/ramips/dts/FIREWRT.dts
target/linux/ramips/dts/FONERA20N.dts
target/linux/ramips/dts/FREESTATION5.dts
target/linux/ramips/dts/GL-MT300A.dts
target/linux/ramips/dts/GL-MT300N.dts
target/linux/ramips/dts/GL-MT750.dts
target/linux/ramips/dts/HC5861.dts
target/linux/ramips/dts/HC5XXX.dtsi
target/linux/ramips/dts/HG255D.dts
target/linux/ramips/dts/HLKRM04.dts
target/linux/ramips/dts/HPM.dts
target/linux/ramips/dts/HT-TM02.dts
target/linux/ramips/dts/HW550-3G.dts
target/linux/ramips/dts/IP2202.dts
target/linux/ramips/dts/JHR-N805R.dts
target/linux/ramips/dts/JHR-N825R.dts
target/linux/ramips/dts/JHR-N926R.dts
target/linux/ramips/dts/LINKIT7688.dts
target/linux/ramips/dts/M2M.dts
target/linux/ramips/dts/M3.dts
target/linux/ramips/dts/M4-4M.dts
target/linux/ramips/dts/M4-8M.dts
target/linux/ramips/dts/MINIEMBPLUG.dts
target/linux/ramips/dts/MINIEMBWIFI.dts
target/linux/ramips/dts/MIWIFI-MINI.dts
target/linux/ramips/dts/MIWIFI-NANO.dts
target/linux/ramips/dts/MLW221.dts
target/linux/ramips/dts/MLWG2.dts
target/linux/ramips/dts/MOFI3500-3GN.dts
target/linux/ramips/dts/MPRA1.dts
target/linux/ramips/dts/MPRA2.dts
target/linux/ramips/dts/MR-102N.dts
target/linux/ramips/dts/MT7620a.dts
target/linux/ramips/dts/MT7620a_MT7530.dts
target/linux/ramips/dts/MT7620a_MT7610e.dts
target/linux/ramips/dts/MT7620a_V22SG.dts
target/linux/ramips/dts/MT7621.dts
target/linux/ramips/dts/MT7628.dts
target/linux/ramips/dts/MZK-750DHP.dts
target/linux/ramips/dts/MZK-DP150N.dts
target/linux/ramips/dts/MZK-EX300NP.dts
target/linux/ramips/dts/MZK-EX750NP.dts
target/linux/ramips/dts/MZK-W300NH2.dts
target/linux/ramips/dts/MZK-WDPR.dts
target/linux/ramips/dts/MicroWRT.dts
target/linux/ramips/dts/NA930.dts
target/linux/ramips/dts/NBG-419N.dts
target/linux/ramips/dts/NCS601W.dts
target/linux/ramips/dts/NW718.dts
target/linux/ramips/dts/OY-0001.dts
target/linux/ramips/dts/PBR-M1.dts
target/linux/ramips/dts/PSG1208.dts
target/linux/ramips/dts/PSR-680W.dts
target/linux/ramips/dts/PWH2004.dts
target/linux/ramips/dts/PX-4885-4M.dts
target/linux/ramips/dts/PX-4885-8M.dts
target/linux/ramips/dts/PX-4885.dtsi
target/linux/ramips/dts/RE6500.dts
target/linux/ramips/dts/RP-N53.dts
target/linux/ramips/dts/RT-G32-B1.dts
target/linux/ramips/dts/RT-N10-PLUS.dts
target/linux/ramips/dts/RT-N13U.dts
target/linux/ramips/dts/RT-N14U.dts
target/linux/ramips/dts/RT-N15.dts
target/linux/ramips/dts/RT-N56U.dts
target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts
target/linux/ramips/dts/RT5350F-OLINUXINO.dts
target/linux/ramips/dts/RUT5XX.dts
target/linux/ramips/dts/SAP-G3200U3.dts
target/linux/ramips/dts/SL-R7205.dts
target/linux/ramips/dts/TEW-691GR.dts
target/linux/ramips/dts/TEW-692GR.dts
target/linux/ramips/dts/TINY-AC.dts
target/linux/ramips/dts/UBNT-ERX.dts
target/linux/ramips/dts/UR-326N4G.dts
target/linux/ramips/dts/UR-336UN.dts
target/linux/ramips/dts/V11STFE.dts
target/linux/ramips/dts/V22RW-2X2.dts
target/linux/ramips/dts/VOCORE-16M.dts
target/linux/ramips/dts/VOCORE-8M.dts
target/linux/ramips/dts/VOCORE.dtsi
target/linux/ramips/dts/W150M.dts
target/linux/ramips/dts/W306R_V20.dts
target/linux/ramips/dts/W502U.dts
target/linux/ramips/dts/WCR150GN.dts
target/linux/ramips/dts/WF-2881.dts
target/linux/ramips/dts/WHR-1166D.dts
target/linux/ramips/dts/WHR-300HP2.dts
target/linux/ramips/dts/WHR-600D.dts
target/linux/ramips/dts/WHR-G300N.dts
target/linux/ramips/dts/WITI.dts
target/linux/ramips/dts/WIZARD8800.dts
target/linux/ramips/dts/WIZFI630A.dts
target/linux/ramips/dts/WL-330N.dts
target/linux/ramips/dts/WL-330N3G.dts
target/linux/ramips/dts/WL-341V3.dts
target/linux/ramips/dts/WL-351.dts
target/linux/ramips/dts/WLI-TX4-AG300N.dts
target/linux/ramips/dts/WMR-300.dts
target/linux/ramips/dts/WNCE2001.dts
target/linux/ramips/dts/WNDR3700V5.dts
target/linux/ramips/dts/WR512-3GN-4M.dts
target/linux/ramips/dts/WR512-3GN-8M.dts
target/linux/ramips/dts/WR6202.dts
target/linux/ramips/dts/WRH-300CR.dts
target/linux/ramips/dts/WRTNODE.dts
target/linux/ramips/dts/WRTNODE2.dtsi
target/linux/ramips/dts/WRTNODE2P.dts
target/linux/ramips/dts/WRTNODE2R.dts
target/linux/ramips/dts/WSR-1166.dts
target/linux/ramips/dts/WSR-600.dts
target/linux/ramips/dts/WT1520-4M.dts
target/linux/ramips/dts/WT1520-8M.dts
target/linux/ramips/dts/WT1520.dtsi
target/linux/ramips/dts/WT3020-4M.dts
target/linux/ramips/dts/WT3020-8M.dts
target/linux/ramips/dts/WZR-AGL300NH.dts
target/linux/ramips/dts/X5.dts
target/linux/ramips/dts/X8.dts
target/linux/ramips/dts/XDXRN502J.dts
target/linux/ramips/dts/Y1.dts
target/linux/ramips/dts/Y1.dtsi
target/linux/ramips/dts/Y1S.dts
target/linux/ramips/dts/YOUKU-YK1.dts
target/linux/ramips/dts/ZBT-WA05.dts
target/linux/ramips/dts/ZBT-WE826.dts
target/linux/ramips/dts/ZBT-WG2626.dts
target/linux/ramips/dts/ZBT-WG3526.dts
target/linux/ramips/dts/ZBT-WR8305RT.dts
target/linux/ramips/dts/ZTE-Q7.dts
target/linux/ramips/dts/mt7620a.dtsi
target/linux/ramips/dts/mt7620n.dtsi
target/linux/ramips/dts/mt7621.dtsi
target/linux/ramips/dts/mt7628an.dtsi
target/linux/ramips/dts/rt2880.dtsi
target/linux/ramips/dts/rt3050.dtsi
target/linux/ramips/dts/rt3352.dtsi
target/linux/ramips/dts/rt3883.dtsi
target/linux/ramips/dts/rt5350.dtsi

index e5fa901..cd2ba51 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "3G-6200N", "ralink,rt3050-soc";
        model = "Edimax 3g-6200n";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x100>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 39f7f5d..5ae43b8 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "3G-6200NL", "ralink,rt3050-soc";
        model = "Edimax 3g-6200nl";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x211>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 66f3e0d..3c92b94 100644 (file)
@@ -6,78 +6,6 @@
        compatible = "3G150B", "ralink,rt5350-soc";
        model = "Tenda 3G150B";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-
-               gpio1: gpio@660 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-               ralink,led-polarity = <1>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+       ralink,led-polarity = <1>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 87badf8..331e9fe 100644 (file)
@@ -6,53 +6,6 @@
        compatible = "3G300M", "ralink,rt3052-soc";
        model = "Tenda 3G300M";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x100>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
+&spi0 {
+       status = "okay";
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 198acba..6a15458 100644 (file)
@@ -6,78 +6,6 @@
        compatible = "A5-V11", "ralink,rt5350-soc";
        model = "A5-V11";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "pm25lq032";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-
-               gpio1: gpio@660 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf", "led";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x1>;
-               mediatek,portdisable = <0x3e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "pm25lq032";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf", "led";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x1>;
+       mediatek,portdisable = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index d53c8d2..2c32933 100644 (file)
@@ -6,80 +6,6 @@
        compatible = "AI-BR100", "ralink,mt7620a-soc";
        model = "Aigale Ai-BR100";
 
-       palmbus@10000000 {
-               gpio2: gpio@660 {
-                       status = "okay";
-               };
-
-               gpio3: gpio@688 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "en25q64";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@20000 {
-                                       label = "u-boot-env";
-                                       reg = <0x20000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@30000 {
-                                       label = "factory";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       label = "firmware";
-                                       reg = <0x40000 0x7c0000>;
-                               };
-                       };
-               };
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&ephy_pins>;
-               mtd-mac-address = <&factory 0x4>;
-               mediatek,portmap = "llllw";
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio2 {
+       status = "okay";
+};
+
+&gpio3 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "en25q64";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x20000>;
+                       read-only;
+               };
+
+               partition@20000 {
+                       label = "u-boot-env";
+                       reg = <0x20000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@30000 {
+                       label = "factory";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "firmware";
+                       reg = <0x40000 0x7c0000>;
+               };
+       };
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mtd-mac-address = <&factory 0x4>;
+       mediatek,portmap = "llllw";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index e89909e..2b6932d 100644 (file)
@@ -6,69 +6,6 @@
        compatible = "AIR3GII", "ralink,rt5350-soc";
        model = "AirLive Air3GII";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "en25q32b";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "en25q32b";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 8a4ccc8..d1d92e1 100644 (file)
@@ -6,14 +6,6 @@
        compatible = "ALL0239-3G", "ralink,rt3052-soc";
        model = "Allnet ALL0239-3G";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
 
        cfi@1f000000 {
                compatible = "cfi-flash";
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               status = "okay";
-               mediatek,portmap = <0x3e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x211>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       status = "okay";
+       mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index fe677a9..713b735 100644 (file)
@@ -6,69 +6,6 @@
        compatible = "ALL0256N", "ralink,rt3050-soc";
        model = "Allnet ALL0256N";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3c8000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3c8000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x3f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 0d75abd..2c4790a 100644 (file)
@@ -6,69 +6,6 @@
        compatible = "ALL0256N", "ralink,rt3050-soc";
        model = "Allnet ALL0256N";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x3f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 72aa789..efaabc2 100644 (file)
@@ -6,77 +6,6 @@
        compatible = "ALL5002", "ralink,rt3352-soc";
        model = "Allnet ALL5002";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l25635e";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x1fb0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        i2c-gpio {
                compatible = "i2c-gpio";
                gpios = <&gpio0 1 0 &gpio0 2 0>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l25635e";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x1fb0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x3f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 806eb26..3a6023a 100644 (file)
@@ -6,77 +6,6 @@
        compatible = "ALL5003", "ralink,rt5350-soc";
        model = "Allnet ALL5003";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l25635e";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x1fb0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        i2c-gpio {
                compatible = "i2c-gpio";
                gpios = <&gpio0 1 0 &gpio0 2 0>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l25635e";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x1fb0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x3f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 5fefc81..c1eac43 100644 (file)
@@ -6,45 +6,6 @@
        compatible = "AR670W", "ralink,rt2880-soc";
        model = "Airlink101 AR670W";
 
-       palmbus@300000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "uartlite";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@400000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x2004>;
-
-               port@0 {
-                       phy-handle = <&phy0>;
-                       phy-mode = "mii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@0 {
-                               phy-mode = "mii";
-                               reg = <0>;
-                       };
-               };
-       };
-
-       wmac@480000 {
-               status = "okay";
-               ralink,mtd-eeprom = <&factory 0x2000>;
-       };
-
        cfi@bdc00000 {
                compatible = "cfi-flash";
                reg = <0xbc400000 0x800000>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "uartlite";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x2004>;
+
+       port@0 {
+               phy-handle = <&phy0>;
+               phy-mode = "mii";
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       phy-mode = "mii";
+                       reg = <0>;
+               };
+       };
+};
+
+&wmac {
+       status = "okay";
+       ralink,mtd-eeprom = <&factory 0x2000>;
+};
index 3c5e0f5..3b8cfb3 100644 (file)
@@ -6,45 +6,6 @@
        compatible = "AR725W", "ralink,rt2880-soc";
        model = "Airlink101 AR725W";
 
-       palmbus@300000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "uartlite";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@400000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x4>;
-
-               port@0 {
-                       phy-handle = <&phy0>;
-                       phy-mode = "mii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@0 {
-                               phy-mode = "mii";
-                               reg = <0>;
-                       };
-               };
-       };
-
-       wmac@480000 {
-               status = "okay";
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        cfi@bdc00000 {
                compatible = "cfi-flash";
                reg = <0xbc400000 0x800000>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "uartlite";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x4>;
+
+       port@0 {
+               phy-handle = <&phy0>;
+               phy-mode = "mii";
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       phy-mode = "mii";
+                       reg = <0>;
+               };
+       };
+};
+
+&wmac {
+       status = "okay";
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 3c6c667..2b2c494 100644 (file)
@@ -6,91 +6,6 @@
        compatible = "ASL26555", "ralink,rt3050-soc";
        model = "Alpha ASL26555";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25sl12801";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "uboot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0xf80000>;
-                               };
-
-                               partition@fd0000 {
-                                       label = "cert";
-                                       reg = <0xfd0000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@fe0000 {
-                                       label = "langpack";
-                                       reg = <0xfe0000 0x10000>;
-                                       read-only;
-                               };
-
-                               devdata: partition@ff0000 {
-                                       label = "devdata";
-                                       reg = <0xff0000 0x10000>;
-                                       read-only;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&devdata 0x4004>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x1e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
-       otg@101c0000 {
-               status = "okay";
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25sl12801";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "uboot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0xf80000>;
+               };
+
+               partition@fd0000 {
+                       label = "cert";
+                       reg = <0xfd0000 0x10000>;
+                       read-only;
+               };
+
+               partition@fe0000 {
+                       label = "langpack";
+                       reg = <0xfe0000 0x10000>;
+                       read-only;
+               };
+
+               devdata: partition@ff0000 {
+                       label = "devdata";
+                       reg = <0xff0000 0x10000>;
+                       read-only;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&devdata 0x4004>;
+};
+
+&esw {
+       mediatek,portmap = <0x1e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
+
+&otg {
+       status = "okay";
+};
index 0860c5e..1c40df4 100644 (file)
@@ -6,85 +6,6 @@
        compatible = "ASL26555", "ralink,rt3050-soc";
        model = "Alpha ASL26555";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25sl064p";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               ubootenv: partition@30000 {
-                                       label = "uboot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       label = "rgdb";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x790000>;
-                               };
-
-                               partition@7e0000 {
-                                       label = "cert";
-                                       reg = <0x7e0000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@7f0000 {
-                                       label = "langpack";
-                                       reg = <0x7f0000 0x10000>;
-                                       read-only;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&ubootenv 0x4004>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x1e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&ubootenv 0x4000>;
-       };
-
-       otg@101c0000 {
-               status = "okay";
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25sl064p";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               ubootenv: partition@30000 {
+                       label = "uboot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "rgdb";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x790000>;
+               };
+
+               partition@7e0000 {
+                       label = "cert";
+                       reg = <0x7e0000 0x10000>;
+                       read-only;
+               };
+
+               partition@7f0000 {
+                       label = "langpack";
+                       reg = <0x7f0000 0x10000>;
+                       read-only;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&ubootenv 0x4004>;
+};
+
+&esw {
+       mediatek,portmap = <0x1e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&ubootenv 0x4000>;
+};
+
+&otg {
+       status = "okay";
+};
index f0a53a1..c15d3a4 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "ATP-52B", "ralink,rt3052-soc";
        model = "Argus ATP-52B";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                        linux,code = <0x198>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x3e>;
-       };
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&esw {
+       mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };
index 7a5f733..d8e69bd 100644 (file)
@@ -6,61 +6,6 @@
        compatible = "AWAPN2403", "ralink,rt3052-soc";
        model = "AsiaRF AWAPN2403";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&esw {
+       mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 4c9f57c..69d25bb 100644 (file)
@@ -3,13 +3,9 @@
 / {
        compatible = "AWM002", "ralink,rt5350-soc";
        model = "AsiaRF AWM002";
+};
 
-       palmbus@10000000 {
-               spi@b00 {
-                       m25p80@0 {
-                               compatible = "jedec,spi-nor";
-                               linux,modalias = "m25p80", "mx25l3205d";
-                       };
-               };
-       };
+&m25p80 {
+       compatible = "jedec,spi-nor";
+       linux,modalias = "m25p80", "mx25l3205d";
 };
index 9fb35c1..1e6970d 100644 (file)
@@ -3,13 +3,9 @@
 / {
        compatible = "AWM002", "ralink,rt5350-soc";
        model = "AsiaRF AWM002";
+};
 
-       palmbus@10000000 {
-               spi@b00 {
-                       m25p80@0 {
-                               compatible = "jedec,spi-nor";
-                               linux,modalias = "m25p80", "mx25l6405d";
-                       };
-               };
-       };
+&m25p80 {
+       compatible = "jedec,spi-nor";
+       linux,modalias = "m25p80", "mx25l6405d";
 };
index ef2f83c..e125232 100644 (file)
@@ -5,14 +5,6 @@
 / {
        model = "AsiaRF AWM002 EVB";
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 563090e..f2f91bb 100644 (file)
@@ -5,14 +5,6 @@
 / {
        model = "AsiaRF AWM002 EVB";
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 3e57b72..bf6876b 100644 (file)
@@ -4,75 +4,73 @@
        compatible = "AWM002", "ralink,rt5350-soc";
        model = "AsiaRF AWM002";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
+       gpio-leds {
+               compatible = "gpio-leds";
 
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               reg = <0 0>;
-                               compatible = "jedec,spi-nor";
-                               spi-max-frequency = <10000000>;
+               ld1 {
+                       label = "awm002:green:ld1";
+                       gpios = <&gpio0 0 1>;
+               };
 
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
+               ld2 {
+                       label = "awm002:green:ld2";
+                       gpios = <&gpio0 1 1>;
+               };
+       };
+};
 
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
+&spi0 {
+       status = "okay";
 
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
+       m25p80: m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               reg = <0 0>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <10000000>;
 
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x1fb0000>;
-                               };
-                       };
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
                };
-       };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag";
-                               ralink,function = "gpio";
-                       };
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
                };
-       };
 
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
-       };
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
 
-       ehci@101c0000 {
-               status = "okay";
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x1fb0000>;
+               };
        };
+};
 
-       ohci@101c1000 {
-               status = "okay";
+&pinctrl {
+       state_default {
+               gpio {
+                       ralink,group = "i2c", "jtag";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       gpio-leds {
-               compatible = "gpio-leds";
+&esw {
+       mediatek,portmap = <0x3f>;
+};
 
-               ld1 {
-                       label = "awm002:green:ld1";
-                       gpios = <&gpio0 0 1>;
-               };
+&ehci {
+       status = "okay";
+};
 
-               ld2 {
-                       label = "awm002:green:ld2";
-                       gpios = <&gpio0 1 1>;
-               };
-       };
+&ohci {
+       status = "okay";
 };
index 02fa972..13e6964 100644 (file)
                reg = <0x0 0x4000000>;
        };
 
-       palmbus@10000000 {
-               spi@b00 {
-                       m25p80@0 {
-                               compatible = "jedec,spi-nor";
-                               linux,modalias = "m25p80", "mx25l6405d";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&m25p80 {
+       compatible = "jedec,spi-nor";
+       linux,modalias = "m25p80", "mx25l6405d";
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 7d830b3..aab1f9b 100644 (file)
                bootargs = "console=ttyS0,115200";
        };
 
-       palmbus@10000000 {
-               gpio2: gpio@660 {
-                       status = "okay";
+       gpio-leds {
+               compatible = "gpio-leds";
+       };
+
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <20>;
+       };
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x20000>;
+                       read-only;
+               };
+
+               partition@20000 {
+                       label = "firmware";
+                       reg = <0x20000 0x7a0000>;
                };
 
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@20000 {
-                                       label = "firmware";
-                                       reg = <0x20000 0x7a0000>;
-                               };
-
-                               partition@7c0000 {
-                                       label = "config";
-                                       reg = <0x7c0000 0x10000>;
-                               };
-
-                               rom: partition@7d0000 {
-                                       label = "rom";
-                                       reg = <0x7d0000 0x10000>;
-                               };
-
-                               partition@7e0000 {
-                                       label = "romfile";
-                                       reg = <0x7e0000 0x10000>;
-                               };
-
-                               radio: partition@7f0000 {
-                                       label = "radio";
-                                       reg = <0x7f0000 0x10000>;
-                               };
-                       };
+               partition@7c0000 {
+                       label = "config";
+                       reg = <0x7c0000 0x10000>;
+               };
+
+               rom: partition@7d0000 {
+                       label = "rom";
+                       reg = <0x7d0000 0x10000>;
+               };
+
+               partition@7e0000 {
+                       label = "romfile";
+                       reg = <0x7e0000 0x10000>;
+               };
+
+               radio: partition@7f0000 {
+                       label = "radio";
+                       reg = <0x7f0000 0x10000>;
                };
        };
+};
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-                               ralink,function = "gpio";
-                       };
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+                       ralink,function = "gpio";
                };
        };
+};
 
-       ethernet@10100000 {
+&ethernet {
                pinctrl-names = "default";
                pinctrl-0 = <&ephy_pins>;
                mtd-mac-address = <&rom 0xf100>;
                mediatek,portmap = "wllll";
        };
 
-       ehci@101c0000 {
-               status = "okay";
-       };
+&ehci {
+       status = "okay";
+};
 
-       ohci@101c1000 {
-               status = "okay";
-       };
+&ohci {
+       status = "okay";
+};
 
-       gsw@10110000 {
-               mediatek,port4 = "ephy";
-       };
+&gsw {
+       mediatek,port4 = "ephy";
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&radio 0>;
-       };
+&wmac {
+       ralink,mtd-eeprom = <&radio 0>;
+};
 
-       pcie@10140000 {
-               status = "okay";
+&pcie {
+       status = "okay";
 
-               pcie-bridge {
-                       mt76@0,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&radio 32768>;
-                               mediatek,2ghz = <0>;
-                       };
+       pcie-bridge {
+               mt76@0,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&radio 32768>;
+                       mediatek,2ghz = <0>;
                };
        };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
-       };
 };
index 9161a55..5ae10a3 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "BC2", "ralink,rt3052-soc";
        model = "NexAira BC2";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                        linux,code = <0x198>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };
index ec66667..b871ead 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "BR-6425", "ralink,rt3052-soc";
        model = "Edimax BR-6425";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                #size-cells = <1>;
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+/*     mtd-mac-address = <&factory 0x4>; */
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+/*     ralink,mtd-eeprom = <&factory 0>; */
+};
index 6211e43..f437ac1 100644 (file)
@@ -6,77 +6,45 @@
        compatible = "BR-6475ND", "ralink,rt3883-soc";
        model = "Edimax BR-6475nD";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       palmbus@10000000 {
-               timer@100 {
-                       status = "okay";
-               };
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <100>;
 
-               gpio1: gpio@638 {
-                       status = "okay";
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 7 1>;
+                       linux,code = <0x198>;
                };
 
-               uartlite@c00 {
-                       status = "okay";
+               rfkill {
+                       label = "rfkill";
+                       gpios = <&gpio0 9 1>;
+                       linux,input-type = <5>;
+                       linux,code = <0xf7>;
                };
        };
 
-       ethernet@10100000 {
-               status = "okay";
-               mtd-mac-address = <&devdata 0x0d>;
+       gpio-leds {
+               compatible = "gpio-leds";
 
-               port@0 {
-                       mediatek,fixed-link = <1000 1 1 1>;
+               power {
+                       label = "br-6475nd:green:power";
+                       gpios = <&gpio0 10 1>;
                };
-       };
 
-       wmac@10180000 {
-               status = "okay";
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       pci@10140000 {
-               status = "okay";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pci_pins>;
-
-               pci_pins: pci {
-                       pci {
-                               ralink,group = "pci";
-                               ralink,function = "pci-fnc";
-                       };
+               wlan {
+                       label = "br-6475nd:amber:wlan";
+                       gpios = <&gpio0 11 1>;
                };
 
-               host-bridge {
-                       pci-bridge@1 {
-                               status = "okay";
-
-                               wmac@0,0 {
-                                       ralink,5ghz = <0>;
-                                       compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-                                       reg = < 0x10000 0 0 0 0 >;
-                                       ralink,eeprom = "rt2x00pci_1_0.eeprom";
-                               };
-                       };
+               wlan_5ghz {
+                       label = "br-6475nd:amber:wlan_5ghz";
+                       gpios = <&gpio0 14 1>;
                };
        };
 
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        nor-flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
        };
 
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
+       /* Unclear if this is the correct gpio setup; the USB ports are
+          unpopulated on a stock BR-6475nD, even though the hardware exists
+          and the headers are there. */
+       /*
+       gpio_export {
+               compatible = "gpio-export";
                #size-cells = <0>;
-               poll-interval = <100>;
 
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 7 1>;
-                       linux,code = <0x198>;
+               usb {
+                       gpio-export,name="usb";
+                       gpio-export,output=<0>;
+                       gpios = <&gpio0 19 0>;
                };
+       };
+       */
+};
 
-               rfkill {
-                       label = "rfkill";
-                       gpios = <&gpio0 9 1>;
-                       linux,input-type = <5>;
-                       linux,code = <0xf7>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "jtag", "uartf";
+                       ralink,function = "gpio";
                };
        };
+};
 
-       gpio-leds {
-               compatible = "gpio-leds";
+&timer {
+       status = "okay";
+};
 
-               power {
-                       label = "br-6475nd:green:power";
-                       gpios = <&gpio0 10 1>;
-               };
+&gpio1 {
+       status = "okay";
+};
 
-               wlan {
-                       label = "br-6475nd:amber:wlan";
-                       gpios = <&gpio0 11 1>;
-               };
+&uartlite {
+       status = "okay";
+};
 
-               wlan_5ghz {
-                       label = "br-6475nd:amber:wlan_5ghz";
-                       gpios = <&gpio0 14 1>;
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&devdata 0x0d>;
+
+       port@0 {
+               mediatek,fixed-link = <1000 1 1 1>;
+       };
+};
+
+&wmac {
+       status = "okay";
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pci {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pci_pins>;
+
+       pci_pins: pci {
+               pci {
+                       ralink,group = "pci";
+                       ralink,function = "pci-fnc";
                };
        };
 
-       /* Unclear if this is the correct gpio setup; the USB ports are
-          unpopulated on a stock BR-6475nD, even though the hardware exists
-          and the headers are there. */
-       /*
-       gpio_export {
-               compatible = "gpio-export";
-               #size-cells = <0>;
+       host-bridge {
+               pci-bridge@1 {
+                       status = "okay";
 
-               usb {
-                       gpio-export,name="usb";
-                       gpio-export,output=<0>;
-                       gpios = <&gpio0 19 0>;
+                       wmac@0,0 {
+                               ralink,5ghz = <0>;
+                               compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
+                               reg = < 0x10000 0 0 0 0 >;
+                               ralink,eeprom = "rt2x00pci_1_0.eeprom";
+                       };
                };
        };
-       */
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
 };
index 40cb985..790dcc0 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "BROADWAY", "ralink,rt3052-soc";
        model = "Hauppauge Broadway";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x3e>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x198>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 5ff60c3..e38c49f 100644 (file)
                bootargs = "console=ttyS0,115200";
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
+       i2c-gpio {
+               compatible = "i2c-gpio";
+               gpios = <&gpio0 1 0 &gpio0 2 0>;
+               i2c-gpio,delay-us = <10>;
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x3f>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&esw {
+       mediatek,portmap = <0x3f>;
+};
 
-       i2c-gpio {
-               compatible = "i2c-gpio";
-               gpios = <&gpio0 1 0 &gpio0 2 0>;
-               i2c-gpio,delay-us = <10>;
-       };
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };
index 9d9e0df..d076e64 100644 (file)
                bootargs = "console=ttyS0,115200";
        };
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               gpio1: gpio@638 {
-                       status = "okay";
-               };
-
-               gpio2: gpio@660 {
-                       status = "okay";
-               };
-
-               gpio3: gpio@688 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "w25q64";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       default {
-                               ralink,group = "ephy", "wled", "spi refclk", "i2c";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&gpio3 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "w25q64";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               default {
+                       ralink,group = "ephy", "wled", "spi refclk", "i2c";
+                       ralink,function = "gpio";
+               };
+       };
+};
index ddd480f..503e095 100644 (file)
@@ -6,122 +6,6 @@
        compatible = "ralink,mt7620a-soc";
        model = "Planex CS-QR10";
 
-       palmbus@10000000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               gpio1: gpio@638 {
-                       status = "okay";
-               };
-
-               gpio2: gpio@660 {
-                       status = "okay";
-               };
-
-               gpio3: gpio@688 {
-                       status = "okay";
-               };
-
-               i2c@900 {
-                       status = "okay";
-               };
-
-               i2s: i2s@a00 {
-                       status = "okay";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pcm_i2s_pins>;
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-
-               pcm@2000 {
-                       status = "okay";
-               };
-
-               gdma@2800 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi refclk", "rgmii1";
-                               ralink,function = "gpio";
-                       };
-                       wdt {
-                               ralink,group = "wdt";
-                               ralink,function = "wdt refclk";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&ephy_pins>;
-               mtd-mac-address = <&factory 0x4>;
-               mediatek,portmap = "llllw";
-       };
-
-       gsw@10110000 {
-               ralink,port4 = "ephy";
-       };
-
-       sdhci@10130000 {
-               status = "okay";
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       pcie@10140000 {
-               status = "okay";
-       };
-
        sound {
                compatible = "mediatek,mt7620-audio-wm8960";
                model = "mt7620-wm8960";
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&gpio3 {
+       status = "okay";
+};
+
+&i2c {
+       status = "okay";
+};
+
+&i2s {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pcm_i2s_pins>;
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pcm {
+       status = "okay";
+};
+
+&gdma {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi refclk", "rgmii1";
+                       ralink,function = "gpio";
+               };
+               wdt {
+                       ralink,group = "wdt";
+                       ralink,function = "wdt refclk";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mtd-mac-address = <&factory 0x4>;
+       mediatek,portmap = "llllw";
+};
+
+&gsw {
+       ralink,port4 = "ephy";
+};
+
+&sdhci {
+       status = "okay";
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pcie {
+       status = "okay";
+};
index 2120dc7..031d8f0 100644 (file)
@@ -6,68 +6,6 @@
        compatible = "CY-SWR1100", "ralink,rt3883-soc";
        model = "Samsung CY-SWR1100";
 
-       palmbus@10000000 {
-               gpio1: gpio@638 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               port@0 {
-                       mediatek,fixed-link = <1000 1 1 1>;
-                       phy-mode = "rgmii";
-               };
-       };
-
-       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";
-
-                               wmac@0,0 {
-                                       ralink,5ghz = <0>;
-                                       compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-                                       reg = < 0x10000 0 0 0 0 >;
-                                       ralink,eeprom = "rt2x00pci_1_0.eeprom";
-                               };
-                       };
-               };
-       };
-
-       wmac@10180000 {
-               status = "okay";
-               ralink,2ghz = <0>;
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        nor-flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                };
        };
 };
+
+&gpio1 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       port@0 {
+               mediatek,fixed-link = <1000 1 1 1>;
+               phy-mode = "rgmii";
+       };
+};
+
+&pci {
+       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";
+
+                       wmac@0,0 {
+                               ralink,5ghz = <0>;
+                               compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
+                               reg = < 0x10000 0 0 0 0 >;
+                               ralink,eeprom = "rt2x00pci_1_0.eeprom";
+                       };
+               };
+       };
+};
+
+&wmac {
+       status = "okay";
+       ralink,2ghz = <0>;
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index cf631ea..2e86d1e 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "D105", "ralink,rt3050-soc";
        model = "Huawei D105";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                        linux,code = <0x198>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };
index e983372..4628544 100644 (file)
                bootargs = "console=ttyS0,115200";
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&devdata 0x2e>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x101>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&devdata 0x2e>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 14c48e2..8014859 100644 (file)
@@ -6,76 +6,6 @@
        compatible = "ralink,mt7620a-soc";
        model = "Planex DB-WRT01";
 
-       palmbus@10000000 {
-               gpio1: gpio@638 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi refclk", "rgmii1";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&ephy_pins>;
-               mtd-mac-address = <&factory 0x4>;
-               mediatek,portmap = "llllw";
-       };
-
-       gsw@10110000 {
-               mediatek,port4 = "ephy";
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       pcie@10140000 {
-               status = "okay";
-       };
-       
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&gpio1 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi refclk", "rgmii1";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mtd-mac-address = <&factory 0x4>;
+       mediatek,portmap = "llllw";
+};
+
+&gsw {
+       mediatek,port4 = "ephy";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pcie {
+       status = "okay";
+};
index 98779f0..373973c 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DCS-930", "ralink,rt3050-soc";
        model = "D-Link DCS-930";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x400000>;
                        linux,code = <0x198>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };
index ad715c1..c1e90b9 100644 (file)
@@ -6,73 +6,6 @@
        compatible = "DCS-930L-B1", "ralink,rt5350-soc";
        model = "D-Link DCS-930L B1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf", "led";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf", "led";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 8772ed4..4f0a7ff 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DIR-300-B1", "ralink,rt3050-soc";
        model = "D-Link DIR-300 B1";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&devdata 0x4004>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&devdata 0x4004>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
index ff6378a..a634bb7 100644 (file)
@@ -6,62 +6,6 @@
        compatible = "DIR-300-B7", "ralink,rt5350-soc";
        model = "D-Link DIR-300 B7";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-               mediatek,led_polarity = <0x17>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x211>;
                };
        };
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
 
-       wmac@10180000 {
-               status = "okay";
-               ralink,led-polarity = <1>;
-               ralink,mtd-eeprom = <&factory 0>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+       mediatek,led_polarity = <0x17>;
+};
+
+&wmac {
+       status = "okay";
+       ralink,led-polarity = <1>;
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 5d29d14..1393947 100644 (file)
@@ -6,66 +6,6 @@
        compatible = "DIR-320-B1", "ralink,rt5350-soc";
        model = "D-Link DIR-320 B1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                               reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-               mediatek,led_polarity = <0x17>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c0000 {
-               status = "okay";
-       };
-
        gpio_export {
                compatible = "gpio-export";
                #size-cells = <0>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+       mediatek,led_polarity = <0x17>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 9d65bb1..d45d3c5 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DIR-600-B1", "ralink,rt3050-soc";
        model = "D-Link DIR-600 B1";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&devdata 0x4004>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&devdata 0x4004>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
index 4215e5b..f0269cf 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DIR-600-B2", "ralink,rt3050-soc";
        model = "D-Link DIR-600 B2";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
index a0f41d3..83faf00 100644 (file)
@@ -6,69 +6,6 @@
        compatible = "DIR-610-A1", "ralink,rt5350-soc";
        model = "D-Link DIR-610 A1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               devdata: partition@30000 {
-                                       label = "devdata";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&devdata 0x4004>;
-       };
-
-       esw@10110000 {
-               status = "okay";
-               mediatek,portmap = <0x2f>;
-               mediatek,led_polarity = <0x17>;
-       };
-
-       wmac@10180000 {
-               status = "okay";
-               ralink,led-polarity = <1>;
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               devdata: partition@30000 {
+                       label = "devdata";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&devdata 0x4004>;
+};
+
+&esw {
+       status = "okay";
+       mediatek,portmap = <0x2f>;
+       mediatek,led_polarity = <0x17>;
+};
+
+&wmac {
+       status = "okay";
+       ralink,led-polarity = <1>;
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
index 531f317..cac9d26 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DIR-615-D", "ralink,rt3050-soc";
        model = "D-Link DIR-615 D";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&devdata 0x4000>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&devdata 0x4000>;
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+
index 6f3d94f..be9cb10 100644 (file)
@@ -6,75 +6,6 @@
        compatible = "DIR-615-H1", "ralink,rt3352-soc";
        model = "D-Link DIR-615 H1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x3b0000>;
-                               };
-                       };
-               };
-       };
-
-       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";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l3205d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
+       };
+};
+
+&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";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index df38f02..68a2346 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "DIR-620-A1", "ralink,rt3050-soc";
        model = "D-Link DIR-620 A1";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                };
        };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                        gpios = <&gpio0 11 0>;
                };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};
index 7838701..5392467 100644 (file)
@@ -6,75 +6,6 @@
        compatible = "DIR-620-D1", "ralink,rt3352-soc";
        model = "D-Link DIR-620 D1";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       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";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                        linux,code = <0x198>;
                };
        };
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
 
-       ehci@101c0000 {
-               status = "okay";
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
        };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+
+               rgmii {
+                       ralink,group = "rgmii";
+                       ralink,function = "rgmii";
+               };
 
-       ohci@101c1000 {
-               status = "okay";
+               mdio {
+                       ralink,group = "mdio";
+                       ralink,function = "mdio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index 9843b1f..1cdb321 100644 (file)
@@ -6,89 +6,6 @@
        compatible = "DIR-645", "ralink,rt3883-soc";
        model = "D-Link DIR-645";
 
-       palmbus@10000000 {
-               gpio1: gpio@638 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80";
-                               spi-max-frequency = <25000000>;
-
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "uboot-env";
-                                       reg = <0x30000 0x4000>;
-                                       read-only;
-                               };
-
-                               factory: partition@34000 {
-                                       label = "factory";
-                                       reg = <0x34000 0x4000>;
-                                       read-only;
-                               };
-
-                               partition@38000 {
-                                       label = "nvram";
-                                       reg = <0x38000 0x8000>;
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       label = "devdata";
-                                       reg = <0x40000 0x10000>;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-
-               port@0 {
-                       mediatek,fixed-link = <1000 1 1 0>;
-               };
-       };
-
-       wmac@10180000 {
-               ralink,5ghz = <0>;
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        rtl8367b {
                compatible = "realtek,rtl8367b";
                gpio-sda = <&gpio0 1 0>;
                };
        };
 };
+
+&gpio1 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80";
+               spi-max-frequency = <25000000>;
+
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "uboot-env";
+                       reg = <0x30000 0x4000>;
+                       read-only;
+               };
+
+               factory: partition@34000 {
+                       label = "factory";
+                       reg = <0x34000 0x4000>;
+                       read-only;
+               };
+
+               partition@38000 {
+                       label = "nvram";
+                       reg = <0x38000 0x8000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "devdata";
+                       reg = <0x40000 0x10000>;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+
+       port@0 {
+               mediatek,fixed-link = <1000 1 1 0>;
+       };
+};
+
+&wmac {
+       ralink,5ghz = <0>;
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
index cebef08..9e9c16d 100644 (file)
@@ -6,96 +6,6 @@
        compatible = "dlink,dir-810l", "ralink,mt7620a-soc";
        model = "D-Link DIR-810L";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory5g: partition@50000 {
-                                       label = "factory5g";
-                                       reg = <0x50000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@60000 {
-                                       label = "Wolf_Config";
-                                       reg = <0x60000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@70000 {
-                                       label = "MyDlink";
-                                       reg = <0x70000 0x80000>;
-                                       read-only;
-                               };
-
-                               partition@e0000 {
-                                       label = "Jffs2";
-                                       reg = <0xe0000 0x80000>;
-                                       read-only;
-                               };
-
-                               partition@170000 {
-                                       label = "firmware";
-                                       reg = <0x170000 0x690000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-               mediatek,portmap = "llllw";
-       };
-
-       gsw@10110000 {
-               mediatek,port4 = "ephy";
-               pinctrl-names = "default";
-               pinctrl-0 = <&ephy_pins>;
-       };
-
-       pcie@10140000 {
-               status = "okay";
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               factory5g: partition@50000 {
+                       label = "factory5g";
+                       reg = <0x50000 0x10000>;
+                       read-only;
+               };
+
+               partition@60000 {
+                       label = "Wolf_Config";
+                       reg = <0x60000 0x10000>;
+                       read-only;
+               };
+
+               partition@70000 {
+                       label = "MyDlink";
+                       reg = <0x70000 0x80000>;
+                       read-only;
+               };
+
+               partition@e0000 {
+                       label = "Jffs2";
+                       reg = <0xe0000 0x80000>;
+                       read-only;
+               };
+
+               partition@170000 {
+                       label = "firmware";
+                       reg = <0x170000 0x690000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+       mediatek,portmap = "llllw";
+};
+
+&gsw {
+       mediatek,port4 = "ephy";
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+};
+
+&pcie {
+       status = "okay";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index a6add70..9ce9aa2 100644 (file)
                bootargs = "console=ttyS0,57600";
        };
 
-       palmbus@1E000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "u-boot-env";
-                                       reg = <0x30000 0x4000>;
-                                       read-only;
-                               };
-
-                               radio: partition@34000 {
-                                       label = "radio";
-                                       reg = <0x34000 0x4000>;
-                                       read-only;
-                               };
-
-                               factory: partition@38000 {
-                                       label = "factory";
-                                       reg = <0x38000 0x8000>;
-                                       read-only;
-                               };
-
-                               partition@40000 {
-                                       label = "defaults";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0xfb0000>;
-                               };
-                       };
-               };
-       };
-
-       pcie@1e140000 {
-               status = "okay";
-
-               pcie0 {
-                       mt76@0,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&radio 0x2000>;
-                               mediatek,2ghz = <0>;
-                       };
-               };
-
-               pcie1 {
-                       mt76@1,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&radio 0>;
-                               mediatek,5ghz = <0>;
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
                poll-interval = <20>;
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x4000>;
+                       read-only;
+               };
+
+               radio: partition@34000 {
+                       label = "radio";
+                       reg = <0x34000 0x4000>;
+                       read-only;
+               };
+
+               factory: partition@38000 {
+                       label = "factory";
+                       reg = <0x38000 0x8000>;
+                       read-only;
+               };
+
+               partition@40000 {
+                       label = "defaults";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0xfb0000>;
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+
+       pcie0 {
+               mt76@0,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&radio 0x2000>;
+                       mediatek,2ghz = <0>;
+               };
+       };
+
+       pcie1 {
+               mt76@1,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&radio 0>;
+                       mediatek,5ghz = <0>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+                       ralink,function = "gpio";
+               };
+       };
+};
index fafe25d..ed1f178 100644 (file)
        compatible = "linksys,e1700", "ralink,mt7620a-soc";
        model = "Linksys E1700";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "config";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x28>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
-
-               port@5 {
-                       status = "okay";
-                       mediatek,fixed-link = <1000 1 1 1>;
-                       phy-mode = "rgmii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy1: ethernet-phy@1 {
-                               reg = <1>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy2: ethernet-phy@2 {
-                               reg = <2>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy3: ethernet-phy@3 {
-                               reg = <3>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy1f: ethernet-phy@1f {
-                               reg = <0x1f>;
-                               phy-mode = "rgmii";
-                       };
-               };
-       };
-
-       gsw@10110000 {
-               mediatek,port4 = "gmac";
-               mediatek,mt7530 = <1>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0 0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
+
+               partition@30000 {
+                       label = "config";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
+
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x28>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+
+       port@5 {
+               status = "okay";
+               mediatek,fixed-link = <1000 1 1 1>;
+               phy-mode = "rgmii";
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       reg = <0>;
+                       phy-mode = "rgmii";
+               };
+
+               phy1: ethernet-phy@1 {
+                       reg = <1>;
+                       phy-mode = "rgmii";
+               };
+
+               phy2: ethernet-phy@2 {
+                       reg = <2>;
+                       phy-mode = "rgmii";
+               };
+
+               phy3: ethernet-phy@3 {
+                       reg = <3>;
+                       phy-mode = "rgmii";
+               };
+
+               phy4: ethernet-phy@4 {
+                       reg = <4>;
+                       phy-mode = "rgmii";
+               };
+
+               phy1f: ethernet-phy@1f {
+                       reg = <0x1f>;
+                       phy-mode = "rgmii";
+               };
+       };
+};
+
+&gsw {
+       mediatek,port4 = "gmac";
+       mediatek,mt7530 = <1>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
index 2e99992..6869166 100644 (file)
@@ -6,15 +6,6 @@
        compatible = "ESR-9753", "ralink,rt3052-soc";
        model = "Senao / EnGenius ESR-9753";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-         &nbs