ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7620a_edimax_br-6208ac-v2.dts

diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
index 5f1c01b35e9090634f7bfd8c8863bfd280a21bca..23af7db0d415d92e84cb3d59e37c28e8420e54a0 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
@@ -37,7 +37,6 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
@@ -45,14 +44,12 @@
 
                // RALINK_REG_PIO3924DATA 39-24
                led_internet: internet {
-                       label = "green:internet";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                // RALINK_REG_PIO7140DATA 44-40
                led_wlan_2_4ghz: wlan_2_4ghz {
-                       label = "green:wlan2g";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
@@ -61,7 +58,6 @@
 
                // RALINK_REG_PIO7140DATA 43-40
                led_wlan_5ghz: wlan_5ghz {
-                       label = "green:wlan5g";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
@@ -70,7 +66,6 @@
 
                // RALINK_REG_PIO7140DATA 42-40
                led_firmware: firmware {
-                       label = "green:firmware";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                        // default-state = "keep";
@@ -78,7 +73,6 @@
 
                // RALINK_REG_PIO7140DATA 41-40
                led_vpn: vpn {
-                       label = "green:vpn";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
@@ -140,10 +134,32 @@
                        };
 
                        // Factory
-                       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 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+
+                                       macaddr_factory_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
+                               };
                        };
 
                        // Cimage
@@ -187,7 +203,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -197,21 +214,8 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
-};