apm821xx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / apm821xx / dts / netgear-wndr4700.dts

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 342f9a01dbdfd9410793f89a887478c349c437d0..0788037981d85749cc4f1474cbdb40fdc4ba160e 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -267,23 +267,25 @@
                                reg = <0x07fc0000 0x00040000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_wifi_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-                               macaddr_wifi_c: macaddr@c {
-                                       reg = <0xc 0x6>;
-                               };
+                                       macaddr_wifi_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                                       macaddr_wifi_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
 
-                               calibration_wifi_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_wifi_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               calibration_wifi_5000: calibration@5000 {
-                                       reg = <0x5000 0x440>;
+                                       calibration_wifi_5000: calibration@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };
@@ -355,7 +357,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-restart {
                        label = "Reset button";
                        gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
@@ -364,7 +366,7 @@
                        debounce-interval = <60>;
                };
 
-               backup_hd {
+               button-backup_hd {
                        label = "Backup HD button";
                        gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
@@ -373,7 +375,7 @@
                        debounce-interval = <60>;
                };
 
-               rfkill {
+               button-rfkill {
                        label = "RFKILL button";
                        gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
@@ -382,7 +384,7 @@
                        debounce-interval = <60>;
                };
 
-               wps {
+               button-wps {
                        label = "WPS button";
                        gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;