ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_buffalo_wsr-600dhp.dts

diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
index 0cdd79cdda89815e7fe091218ef689a1ce56eacb..e3b165c640534fece4d22b80990723650225f486 100644 (file)
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,wsr-600dhp", "mediatek,mt7621-soc";
@@ -16,98 +15,89 @@
                led-upgrade = &led_power;
        };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x4000000>;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "wsr-600:green:power";
-                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wifi_o {
-                       label = "wsr-600:orange:wifi";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       label = "orange:wifi";
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                diag {
-                       label = "wsr-600:orange:diag";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       label = "orange:diag";
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                wifi_g {
-                       label = "wsr-600:green:wifi";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       label = "green:wifi";
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                router_o {
-                       label = "wsr-600:orange:router";
-                       gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
+                       label = "orange:router";
+                       gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                };
 
                router_g {
-                       label = "wsr-600:green:router";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       label = "green:router";
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
 
                internet_o {
-                       label = "wsr-600:orange:internet";
-                       gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+                       label = "orange:internet";
+                       gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
                };
 
                internet_g {
-                       label = "wsr-600:green:internet";
-                       gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+                       label = "green:internet";
+                       gpios = <&gpio 48 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                power {
                        label = "power";
-                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                aoss {
                        label = "aoss";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                auto {
                        label = "mode";
-                       gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
 
                ap {
                        label = "ap";
-                       gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
 
                router {
                        label = "router";
-                       gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
@@ -115,14 +105,14 @@
 
        gpio_poweroff {
                compatible = "gpio-poweroff";
-               gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
        };
 };
 
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -144,10 +134,28 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -159,12 +167,10 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "uart2", "uart3", "sdhci";
+               function = "gpio";
        };
 };
 
@@ -175,14 +181,60 @@
 &pcie0 {
        rt5592@0,0 {
                reg = <0x0000 0 0 0 0>;
-               ralink,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &pcie1 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
+       };
+};
+
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy4>;
+
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
        };
 };