ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_tplink_archer-c2-v1.dts

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
index 184af58d2920d7207943461094fe9ffdad67e947..7ec18fe7fcf30bd4cac3f4eb5e52f08292a5ab85 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "tplink,archer-c2-v1", "ralink,mt7620a-soc";
@@ -22,29 +23,34 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                led_wps: wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
@@ -105,10 +111,22 @@
                                read-only;
                        };
 
-                       rom: partition@7d0000 {
+                       partition@7d0000 {
                                label = "rom";
                                reg = <0x7d0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_rom_f100: macaddr@f100 {
+                                               compatible = "mac-base";
+                                               reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@7e0000 {
@@ -117,10 +135,24 @@
                                read-only;
                        };
 
-                       radio: partition@7f0000 {
+                       partition@7f0000 {
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_radio_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_radio_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+                               };
                        };
                };
        };
@@ -130,7 +162,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
-       mtd-mac-address = <&rom 0xf100>;
+       nvmem-cells = <&macaddr_rom_f100 0>;
+       nvmem-cell-names = "mac-address";
 
        port@5 {
                status = "okay";
@@ -163,8 +196,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&radio 0x0>;
-       mtd-mac-address = <&rom 0xf100>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ehci {
@@ -182,8 +215,7 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&radio 0x8000>;
-               mtd-mac-address = <&rom 0xf100>;
-               mtd-mac-address-increment = <(-1)>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };