ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3052_belkin_f5d8235-v2.dts

diff --git a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
index af2a5bc9b5f85d13930e4d1d08048a0d2d700d9a..13b16921b995cff01855bc66736986d8d5b68e51 100644 (file)
--- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
+++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_router;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -31,6 +29,20 @@
                                label = "uboot";
                                reg = <0x0 0x50000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_uboot_40000: eeprom@40000 {
+                                               reg = <0x40000 0x200>;
+                                       };
+
+                                       macaddr_uboot_40004: macaddr@40004 {
+                                               reg = <0x40004 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -61,49 +73,49 @@
                compatible = "gpio-leds";
 
                internet {
-                       label = "f5d8235-v2:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
                };
 
                internet2 {
-                       label = "f5d8235-v2:amber:internet";
+                       label = "amber:internet";
                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
                };
 
                modem {
-                       label = "f5d8235-v2:blue:modem";
+                       label = "blue:modem";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                modem2 {
-                       label = "f5d8235-v2:amber:modem";
+                       label = "amber:modem";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
                led_router: router {
-                       label = "f5d8235-v2:blue:router";
+                       label = "blue:router";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                storage {
-                       label = "f5d8235-v2:blue:storage";
+                       label = "blue:storage";
                        gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&otg_port1>;
                        linux,default-trigger = "usbport";
                };
 
                storage2 {
-                       label = "f5d8235-v2:amber:storage";
+                       label = "amber:storage";
                        gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
                };
 
                security {
-                       label = "f5d8235-v2:blue:security";
+                       label = "blue:security";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
 
                security2 {
-                       label = "f5d8235-v2:amber:security";
+                       label = "amber:security";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
        };
@@ -111,13 +123,14 @@
 
 &state_default {
        gpio {
-               ralink,group = "spi", "i2c", "jtag", "mdio", "uartf";
-               ralink,function = "gpio";
+               groups = "spi", "i2c", "jtag", "mdio", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&uboot 0x40004>;
+       nvmem-cells = <&macaddr_uboot_40004>;
+       nvmem-cell-names = "mac-address";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii_pins>;
 };
@@ -136,7 +149,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&uboot 0x40000>;
+       nvmem-cells = <&eeprom_uboot_40000>;
+       nvmem-cell-names = "eeprom";
 };
 
 &otg {