ramips: mt7628: use nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7628an_mediatek_linkit-smart-7688.dts

diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index 7fe47d98535215fbb1e4c861ddd4b951ae4dd82c..1bd7f8e6daa15efd4e0511e119227ec41b94c6d8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -34,7 +32,7 @@
                compatible = "gpio-leds";
 
                led_wifi: wifi {
-                       label = "linkit-smart-7688:orange:wifi";
+                       label = "orange:wifi";
                        gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
@@ -52,33 +50,33 @@
 
 &state_default {
        gpio {
-               ralink,group = "gpio";
-               ralink,function = "gpio";
+               groups = "gpio";
+               function = "gpio";
        };
 
        refclk {
-               ralink,group = "refclk";
-               ralink,function = "gpio";
+               groups = "refclk";
+               function = "gpio";
        };
 
        i2s {
-               ralink,group = "i2s";
-               ralink,function = "gpio";
+               groups = "i2s";
+               function = "gpio";
        };
 
        spis {
-               ralink,group = "spis";
-               ralink,function = "gpio";
+               groups = "spis";
+               function = "gpio";
        };
 
        wled_an {
-               ralink,group = "wled_an";
-               ralink,function = "gpio";
+               groups = "wled_an";
+               function = "gpio";
        };
 
        wdt {
-               ralink,group = "wdt";
-               ralink,function = "gpio";
+               groups = "wdt";
+               function = "gpio";
        };
 };
 
@@ -88,7 +86,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <40000000>;
@@ -113,6 +111,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_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -149,7 +161,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_2e>;
+       nvmem-cell-names = "mac-address";
 };
 
 &sdhci {
@@ -159,4 +172,7 @@
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };