ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_tplink_re650-v2.dts

diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v2.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v2.dts
index aa65b68f0635d97e3944ebbf0687566b00f86a32..ef066f5a9430b50c53b7dbe68ec6139b1356b2a2 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_re650-v2.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re650-v2.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "tplink,re650-v2", "mediatek,mt7621-soc";
@@ -53,7 +54,8 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
@@ -70,12 +72,14 @@
                };
 
                wps_red {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 26 GPIO_ACTIVE_HIGH>;
                };
 
                wps_blue {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
                };
 
@@ -116,16 +120,42 @@
                                reg = <0x20000 0x7a0000>;
                        };
 
-                       config: partition@7c0000 {
+                       partition@7c0000 {
                                label = "config";
                                reg = <0x7c0000 0x2d440>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_10008: macaddr@10008 {
+                                               compatible = "mac-base";
+                                               reg = <0x10008 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
-                       radio: partition@7f0000 {
+                       partition@7f0000 {
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+                               };
                        };
                };
        };
@@ -146,10 +176,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x0>;
-               nvmem-cells = <&macaddr_config_10008>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
+               nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -158,10 +186,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               nvmem-cells = <&macaddr_config_10008>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -171,7 +197,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_config_10008>;
+       nvmem-cells = <&macaddr_config_10008 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -183,13 +209,3 @@
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_10008: macaddr@10008 {
-               reg = <0x10008 0x6>;
-       };
-};