ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_sercomm_na502s.dts

diff --git a/target/linux/ramips/dts/mt7621_sercomm_na502s.dts b/target/linux/ramips/dts/mt7621_sercomm_na502s.dts
index 705ee0dd9bd69817d80b1d7aa00753a27fb6669a..e794ef8875079058c1372e0baffee8d95d3af557 100644 (file)
--- a/target/linux/ramips/dts/mt7621_sercomm_na502s.dts
+++ b/target/linux/ramips/dts/mt7621_sercomm_na502s.dts
@@ -3,6 +3,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "sercomm,na502s", "mediatek,mt7621-soc";
@@ -19,7 +20,8 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
@@ -40,7 +42,8 @@
                };
 
                bluetooth {
-                       label = "green:bluetooth";
+                       function = LED_FUNCTION_BLUETOOTH;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio_expander1 3 GPIO_ACTIVE_LOW>;
                };
 
@@ -204,7 +207,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cells = <&macaddr_factory_e000 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -228,19 +231,28 @@
                        read-only;
                };
 
-               factory: partition@100000 {
-                       compatible = "nvmem-cells";
+               partition@100000 {
                        label = "factory";
                        reg = <0x100000 0x40000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
-                       eeprom_factory_0: eeprom@0 {
-                               reg = <0x0 0x400>;
-                       };
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
-                       macaddr_factory_e000: macaddr@e000 {
-                               reg = <0xe000 0x6>;
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x200>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       compatible = "mac-base";
+                                       reg = <0xe000 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
                        };
                };
 
@@ -289,10 +301,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
-               nvmem-cells = <&macaddr_factory_e000>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -301,9 +311,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0 0 0 0 0>;
-               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000>;
+               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 2>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <2>;
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -327,6 +336,7 @@
                reg = <0x22>;
 
                gpio-controller;
+               interrupt-controller;
        };
 
        gpio_expander0: gpio-expander0@20 {
@@ -336,6 +346,7 @@
                reg = <0x20>;
 
                gpio-controller;
+               interrupt-controller;
        };
 
        gpio_expander1: gpio-expander1@21 {
@@ -345,6 +356,7 @@
                reg = <0x21>;
 
                gpio-controller;
+               interrupt-controller;
        };
 };