ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / rt3883_trendnet_tew-691gr.dts

diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
index 6830f736fa6feefecbd9b597c58bb9f9edc07630..d9ad78ba2b61613dd660e08842a501a8ea4bbf84 100644 (file)
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.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 = "trendnet,tew-691gr", "ralink,rt3883-soc";
@@ -16,7 +15,7 @@
                led-upgrade = &led_wps;
        };
 
-       nor-flash@1c000000 {
+       flash@1c000000 {
                compatible = "cfi-flash";
                reg = <0x1c000000 0x800000>;
                bank-width = <2>;
@@ -38,10 +37,26 @@
                                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>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -79,7 +94,8 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "tew-691gr:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
        };
@@ -91,13 +107,14 @@
 
 &state_default {
        gpio {
-               ralink,group = "spi", "i2c", "jtag", "uartf";
-               ralink,function = "gpio";
+               groups = "spi", "i2c", "jtag", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4 0>;
+       nvmem-cell-names = "mac-address";
 
        port@0 {
                phy-handle = <&phy0>;
@@ -115,9 +132,7 @@
 };
 
 &wmac {
-       status = "okay";
-       ralink,mtd-eeprom = <&factory 0x0>;
        ralink,5ghz = <0>;
-       mtd-mac-address = <&factory 0x4>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 1>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };