ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_dlink_dir-860l-b1.dts

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
index fac41f206bb9f96616de7ac20bc2aa2ff01e559f..8939e523fedbbebbeafc0599d8476ae8654f08cb 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dir-860l-b1", "mediatek,mt7621-soc";
@@ -20,12 +21,14 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power2 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
@@ -82,13 +85,31 @@
                                read-only;
                        };
 
-                       radio: partition@34000 {
+                       partition@34000 {
                                label = "radio";
                                reg = <0x34000 0x4000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_radio_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_radio_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
+                               };
                        };
 
-                       factory: partition@38000 {
+                       partition@38000 {
                                label = "factory";
                                reg = <0x38000 0x8000>;
                                read-only;
@@ -163,7 +184,8 @@
 &pcie0 {
        wifi0: mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x2000>;
+               nvmem-cells = <&eeprom_radio_2000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -171,7 +193,8 @@
 &pcie1 {
        wifi1: mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x0>;
+               nvmem-cells = <&eeprom_radio_0>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -182,13 +205,3 @@
                function = "gpio";
        };
 };
-
-&radio {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_radio_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};