ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3662_dlink_dir-645.dts

diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
index 5effbf9fa2601a41413aea98a9193c12a00e8f63..87d52d679c120a15b353f1addb165ab01481c5ce 100644 (file)
--- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
+++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3883.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -29,13 +27,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -44,12 +42,12 @@
                compatible = "gpio-leds";
 
                inet {
-                       label = "dir-645:green:inet";
+                       label = "green:inet";
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
 
                led_wps: wps {
-                       label = "dir-645:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -73,7 +71,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <25000000>;
@@ -99,6 +97,20 @@
                                label = "factory";
                                reg = <0x34000 0x4000>;
                                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@38000 {
@@ -121,17 +133,16 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "jtag", "uartf";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "i2c", "jtag", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 
        port@0 {
                mediatek,fixed-link = <1000 1 1 0>;
@@ -140,7 +151,8 @@
 
 &wmac {
        ralink,5ghz = <0>;
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ehci {