ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7621_jcg_q20.dts b/target/linux/ramips/dts/mt7621_jcg_q20.dts
index 34236954d0b6d4caef37518b433b16cff98fbab6..49f51ded7fb28a5b7d48774b033c50d99a99a740 100644 (file)
--- a/target/linux/ramips/dts/mt7621_jcg_q20.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_q20.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "jcg,q20", "mediatek,mt7621-soc";
@@ -25,12 +26,14 @@
                compatible = "gpio-leds";
 
                led_status_red: status_red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -87,10 +90,28 @@
                        reg = <0x80000 0x80000>;
                };
 
-               factory: partition@100000 {
+               partition@100000 {
                        label = "Factory";
                        reg = <0x100000 0x80000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0xe00>;
+                               };
+
+                               macaddr_factory_3fff4: macaddr@3fff4 {
+                                       reg = <0x3fff4 0x6>;
+                               };
+
+                               macaddr_factory_3fffa: macaddr@3fffa {
+                                       reg = <0x3fffa 0x6>;
+                               };
+                       };
                };
 
                partition@180000 {
@@ -139,7 +160,8 @@
        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";
                mediatek,disable-radar-background;
        };
 };
@@ -184,17 +206,3 @@
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_3fff4: macaddr@3fff4 {
-               reg = <0x3fff4 0x6>;
-       };
-
-       macaddr_factory_3fffa: macaddr@3fffa {
-               reg = <0x3fffa 0x6>;
-       };
-};