ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_mercusys_mr70x-v1.dts

diff --git a/target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts b/target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts
index ce365450abae65ac5480a9efe6f752f752a5eef5..fb14bd7829fb0813c71b01231637d83354dc9549 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts
+++ b/target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts
@@ -4,10 +4,11 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "mercusys,mr70x-v1", "mediatek,mt7621-soc";
-       model = "Mercusys MR70X v1";
+       model = "MERCUSYS MR70X v1";
 
        aliases {
                led-boot = &led_power_green;
@@ -35,12 +36,14 @@
                compatible = "gpio-leds";
 
                led_power_green: power-green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power-orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
        };
@@ -71,16 +74,21 @@
                                reg = <0x040000 0xf60000>;
                        };
 
-                       config: partition@fa0000 {
-                               compatible = "nvmem-cells";
+                       partition@fa0000 {
                                label = "config";
                                reg = <0xfa0000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_config_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               compatible = "mac-base";
+                                               reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -90,16 +98,19 @@
                                read-only;
                        };
 
-                       radio: partition@ff0000 {
-                               compatible = "nvmem-cells";
+                       partition@ff0000 {
                                label = "radio";
                                reg = <0xff0000 0x010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_radio_0: eeprom@0 {
-                                       reg = <0x0 0xe00>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0xe00>;
+                                       };
                                };
                        };
                };
@@ -114,14 +125,14 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_8>;
+               nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_8 0>;
                nvmem-cell-names = "eeprom", "mac-address";
                mediatek,disable-radar-background;
        };
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cells = <&macaddr_config_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -130,9 +141,8 @@
        label = "wan";
        phy-handle = <&ethphy0>;
 
-       nvmem-cells = <&macaddr_config_8>;
+       nvmem-cells = <&macaddr_config_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &mdio {