ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3050_dlink_dir-600-b1.dts

diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
index 7eabafc01cf90855f8cff00375d21c5adcb739a2..73e65128e592e7a357599772fae6a8c17195b81a 100644 (file)
--- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_status_green;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -37,6 +35,20 @@
                                label = "devdata";
                                reg = <0x30000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_devdata_4000: eeprom@4000 {
+                                               reg = <0x4000 0x200>;
+                                       };
+
+                                       macaddr_devdata_4004: macaddr@4004 {
+                                               reg = <0x4004 0x6>;
+                                       };
+                               };
                        };
 
                        factory: partition@40000 {
@@ -74,27 +86,27 @@
                compatible = "gpio-leds";
 
                status {
-                       label = "dir-600-b1:amber:status";
+                       label = "amber:status";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: status2 {
-                       label = "dir-600-b1:green:status";
+                       label = "green:status";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "dir-600-b1:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                wan2 {
-                       label = "dir-600-b1:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "dir-600-b1:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -108,7 +120,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&devdata 0x4004>;
+       nvmem-cells = <&macaddr_devdata_4004>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -116,5 +129,6 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&devdata 0x4000>;
+       nvmem-cells = <&eeprom_devdata_4000>;
+       nvmem-cell-names = "eeprom";
 };