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

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

diff --git a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
index 80eba827d75617b6bd4bcad4300eb767ae43ff4a..511b76abde09450e21efb642a2d28bd97bba2979 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
+++ b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -34,22 +35,26 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
                };
 
                wan_orange {
-                       label = "orange:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
 
                wan_green {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                power_orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -99,7 +104,9 @@
                                        };
 
                                        macaddr_factory_28: macaddr@28 {
+                                               compatible = "mac-base";
                                                reg = <0x28 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -145,7 +152,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cells = <&macaddr_factory_28 0>;
        nvmem-cell-names = "mac-address";
 
        mediatek,portmap = "llllw";
@@ -159,7 +166,7 @@
        pinctrl-names = "default", "pa_gpio";
        pinctrl-0 = <&pa_pins>;
        pinctrl-1 = <&pa_gpio_pins>;
-       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 0>;
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
@@ -171,8 +178,7 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 2>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <2>;
        };
 };