ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_oraybox_x3a.dts

diff --git a/target/linux/ramips/dts/mt7621_oraybox_x3a.dts b/target/linux/ramips/dts/mt7621_oraybox_x3a.dts
index fd7a8e6eca1d3e532030c64ab7534d0891f336e6..7b33efd6e66a66f6e243dffeca0880ca0e77f266 100644 (file)
--- a/target/linux/ramips/dts/mt7621_oraybox_x3a.dts
+++ b/target/linux/ramips/dts/mt7621_oraybox_x3a.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "oraybox,x3a", "mediatek,mt7621-soc";
@@ -25,17 +26,20 @@
                compatible = "gpio-leds";
 
                led_status_red: status-red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: status-blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: status-green {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -76,10 +80,20 @@
                                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 0x4da8>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -93,12 +107,16 @@
                                reg = <0xfe0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_bdinfo_9: macaddr@9 {
-                                       reg = <0x9 0x6>;
+                                       macaddr_bdinfo_9: macaddr@9 {
+                                               compatible = "mac-base";
+                                               reg = <0x9 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -119,12 +137,13 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_bdinfo_9>;
+       nvmem-cells = <&macaddr_bdinfo_9 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -133,9 +152,8 @@
        label = "wan";
        phy-handle = <&ethphy4>;
 
-       nvmem-cells = <&macaddr_bdinfo_9>;
+       nvmem-cells = <&macaddr_bdinfo_9 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &mdio {
@@ -145,7 +163,7 @@
 };
 
 &switch0 {
-       ports {         
+       ports {
                port@2 {
                        status = "okay";
                        label = "lan2";