ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt3052_upvel_ur-336un.dts

diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
index 937278db92e7519fcde047568546381503458f0d..4a7dc5511c610229bea8dae9532399ef3b034d0b 100644 (file)
--- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "upvel,ur-336un", "ralink,rt3052-soc";
@@ -16,7 +15,7 @@
                led-upgrade = &led_wps;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -39,10 +38,24 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_factory_4004: macaddr@4004 {
+                                               reg = <0x4004 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -57,27 +70,28 @@
                compatible = "gpio-leds";
 
                3g {
-                       label = "ur-336un:green:3g";
+                       label = "green:3g";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                gateway {
-                       label = "ur-336un:green:gateway";
+                       label = "green:gateway";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                ap {
-                       label = "ur-336un:green:ap";
+                       label = "green:ap";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
 
                led_wps: wps {
-                       label = "ur-336un:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                station {
-                       label = "ur-336un:green:station";
+                       label = "green:station";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -100,17 +114,16 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4004>;
+       nvmem-cells = <&macaddr_factory_4004>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -118,7 +131,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &otg {