ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7621_yuncore_fap690.dts b/target/linux/ramips/dts/mt7621_yuncore_fap690.dts
index a998b95d4c51eee523643b140868e2ba77d61ed7..9f7ca430922f36f55e86781e5f11ee3c32bd26f9 100644 (file)
--- a/target/linux/ramips/dts/mt7621_yuncore_fap690.dts
+++ b/target/linux/ramips/dts/mt7621_yuncore_fap690.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "yuncore,fap690", "mediatek,mt7621-soc";
@@ -25,17 +26,20 @@
                compatible = "gpio-leds";
 
                led_status_green: status_green {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: status_red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
@@ -89,10 +93,28 @@
                         * firmware, so we do not use it either
                         */
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0xe00>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       precal_factory_e10: precal@e10 {
+                                               reg = <0xe10 0x19c10>;
+                                       };
+                               };
                        };
 
                        partition@90000 {
@@ -112,13 +134,14 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0>;
+               nvmem-cells = <&eeprom_factory_0>, <&precal_factory_e10>;
+               nvmem-cell-names = "eeprom", "precal";
                mediatek,disable-radar-background;
        };
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_0004>;
+       nvmem-cells = <&macaddr_factory_4>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -137,13 +160,3 @@
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_0004: macaddr@0004 {
-               reg = <0x0004 0x6>;
-       };
-};