ramips: convert to new LED color/function format where possible

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_iptime_a6004ns-m.dtsi

diff --git a/target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi b/target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi
index b00fbeb47f913885583884db00ca7939b3e0793c..64ef31261525fb4e226374a5fec3ac0632e8094d 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi
+++ b/target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -18,7 +19,8 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&xhci_ehci_port1>;
                        linux,default-trigger = "usbport";
@@ -37,7 +39,8 @@
                };
 
                led_cpu: cpu {
-                       label = "blue:cpu";
+                       function = LED_FUNCTION_CPU;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };
@@ -77,6 +80,20 @@
                                label = "u-boot";
                                reg = <0x0 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc20: macaddr@1fc20 {
+                                               reg = <0x1fc20 0x6>;
+                                       };
+
+                                       macaddr_uboot_1fc40: macaddr@1fc40 {
+                                               reg = <0x1fc40 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -89,6 +106,20 @@
                                label = "factory";
                                reg = <0x30000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -159,7 +190,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";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
@@ -168,21 +200,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc20: macaddr@1fc20 {
-               reg = <0x1fc20 0x6>;
-       };
-
-       macaddr_uboot_1fc40: macaddr@1fc40 {
-               reg = <0x1fc40 0x6>;
-       };
-};