ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3883_trendnet_tew-691gr.dts

diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
index aeed7fbb24439507c90625edba053028b584678a..4cd356e7a1269c08e8b90438d72039a54f74ab54 100644 (file)
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3883.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_wps;
        };
 
-       nor-flash@1c000000 {
+       flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
@@ -42,6 +40,20 @@
                                reg = <0x00040000 0x00010000>;
                                label = "factory";
                                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 {
@@ -79,7 +91,7 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "tew-691gr:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
        };
@@ -89,17 +101,16 @@
        status = "okay";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "spi", "i2c", "jtag", "uartf";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "spi", "i2c", "jtag", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 
        port@0 {
                phy-handle = <&phy0>;
@@ -117,9 +128,8 @@
 };
 
 &wmac {
-       status = "okay";
-       ralink,mtd-eeprom = <&factory 0x0>;
        ralink,5ghz = <0>;
-       mtd-mac-address = <&factory 0x4>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>;
+       nvmem-cell-names = "eeprom", "mac-address";
+       mac-address-increment = <1>;
 };