ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / rt3662_asus_rt-n56u.dts

diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
index 13f6cdd1ddff7677a7d343db2f77b864f76c5295..391076cee963d726a82cc4f9a5acf41beb89bd6b 100644 (file)
--- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
+++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt3883.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "asus,rt-n56u", "ralink,rt3662-soc", "ralink,rt3883-soc";
@@ -16,7 +15,7 @@
                led-upgrade = &led_power;
        };
 
-       nor-flash@1c000000 {
+       flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
@@ -38,10 +37,28 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                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>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -80,22 +97,26 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "rt-n56u:blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "rt-n56u:blue:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "rt-n56u:blue:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "rt-n56u:blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -105,17 +126,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 {
                mediatek,fixed-link = <1000 1 1 1>;
@@ -132,14 +152,15 @@
        wifi@0,0 {
                compatible = "pci1814,3091";
                reg = <0x10000 0 0 0 0>;
-               ralink,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               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 {