ramips: mt7621: convert to nvmem-layout

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_elecom_wrc-1167ghbk2-s.dts

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
index 3d0b72652686eb84f8345d601de93519a11fb8be..b280790d64f06cc708ee35cf4d376b3e27ab1c9a 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,42 +14,38 @@
                led-upgrade = &led_power_green;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "wrc-1167ghbk2-s:white:wlan2g";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       label = "white:wlan2g";
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0radio";
                };
 
                wlan5g {
-                       label = "wrc-1167ghbk2-s:white:wlan5g";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       label = "white:wlan5g";
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "wrc-1167ghbk2-s:green:power";
-                       gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+                       label = "green:power";
+                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
 
                power_blue {
-                       label = "wrc-1167ghbk2-s:blue:power";
-                       gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+                       label = "blue:power";
+                       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "wrc-1167ghbk2-s:red:wps";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+                       label = "red:wps";
+                       gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                power_red {
-                       label = "wrc-1167ghbk2-s:red:power";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+                       label = "red:power";
+                       gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -60,26 +54,66 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy0>;
+
+       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
+&switch0 {
+       ports {
+               port@1 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan1";
+               };
+       };
 };
 
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -105,6 +139,24 @@
                                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 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -128,12 +180,10 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "uart3", "jtag", "wdt";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "uart3", "jtag", "wdt";
+               function = "gpio";
        };
 };
 
@@ -145,9 +195,9 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0>;
-               mtd-mac-address = <&factory 0xe000>;
-               mtd-mac-address-increment = <1>;
+               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000>;
+               nvmem-cell-names = "eeprom", "mac-address";
+               mac-address-increment = <1>;
        };
 };