ramips: mt7628: use nvmem-layout

[openwrt/staging/stintel.git] / target / linux / ramips / dts / mt7628an_glinet_vixmini_microuter.dtsi

diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
index b88f9e7356b11f0e508f97e180fffde9baa8fc0e..a40be00887f1857938d5c6abc58eaefff7c30390 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
+++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
@@ -23,13 +23,13 @@
                compatible = "gpio-leds";
 
                led_power_blue: power {
-                       /* Name is set device-specific */
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       label = "blue:power";
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
-               led_wlan_white: wlan {
-                       /* Name is set device-specific */
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+               wlan {
+                       label = "white:wlan";
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };
@@ -39,7 +39,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -47,17 +47,21 @@
 
 &state_default {
        gpio {
-               ralink,group = "wdt", "wled_an", "p1led_an";
-               ralink,function = "gpio";
+               groups = "wdt", "wled_an", "p1led_an";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &spi0 {
@@ -89,6 +93,20 @@
                                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>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        /*