ramips: rtxxxx: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ramips / dts / rt3662_samsung_cy-swr1100.dts

diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
index 9b1c41cde0926ad7255dba5be0b32027870e870e..b022b5c2be709a3b424e1a47b6b400dfc55d58ab 100644 (file)
--- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
+++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3883.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_power;
        };
 
-       nor-flash@1c000000 {
+       flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
@@ -42,6 +40,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>;
+                                       };
+
+                                       eeprom_factory_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
+                               };
                        };
 
                        partition@38000 {
@@ -91,19 +103,19 @@
                compatible = "gpio-leds";
 
                wps {
-                       label = "cy-swr1100:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "cy-swr1100:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                led_power: power {
-                       label = "cy-swr1100:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                };
        };
@@ -137,14 +149,15 @@
        wifi@0,0 {
                compatible = "pci1814,3091";
                reg = <0x10000 0 0 0 0>;
-               ralink,mtd-eeprom = <&factory 0x2000>;
+               nvmem-cells = <&eeprom_factory_2000>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &wmac {
-       status = "okay";
        ralink,2ghz = <0>;
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ehci {