ramips: mt7620n: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7620n_zyxel_keenetic-omni-ii.dts

diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
index 765629548cd435eaaee30c0430b01ec485cc78e2..1937c3a14c1f65c7cfdb3d02bec6a3f549dc04ce 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620n.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -20,31 +18,30 @@
                compatible = "gpio-leds";
 
                wan {
-                       label = "kn_rc:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "kn_rc:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wifi {
-                       label = "kn_rc:green:wifi";
+                       label = "green:wifi";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "kn_rc:green:power";
+                       label = "green:power";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
                compatible = "gpio-keys";
-               poll-interval = <20>;
 
                reset {
                        label = "reset";
@@ -88,7 +85,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -114,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 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -125,22 +136,23 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "wdt", "pa", "spi refclk", "wled";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "wllll";
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ehci {