ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3050_tenda_w150m.dts

diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
index 9c28c2999d8b680b35ac8f5afa8052a00d6f10e4..d9a3f5ac6b41dc27a8ebb766adeabe3b6cc21b83 100644 (file)
--- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts
+++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_ap;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -43,6 +41,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 {
@@ -57,32 +69,32 @@
                compatible = "gpio-leds";
 
                3grouter {
-                       label = "w150m:blue:3grouter";
+                       label = "blue:3grouter";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                led_ap: ap {
-                       label = "w150m:blue:ap";
+                       label = "blue:ap";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                wisprouter {
-                       label = "w150m:blue:wisprouter";
+                       label = "blue:wisprouter";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wirelessrouter {
-                       label = "w150m:blue:wirelessrouter";
+                       label = "blue:wirelessrouter";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
 
                3g {
-                       label = "w150m:blue:3g";
+                       label = "blue:3g";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wpsreset {
-                       label = "w150m:blue:wpsreset";
+                       label = "blue:wpsreset";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
        };
@@ -113,7 +125,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -121,5 +134,6 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };