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

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9531_comfast_cf-e314n-v2.dts

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index c182390b21730cdc4a66857cca589467b7f4c917..9a616921e5392fe3a0234d5752e497e4e07d824b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "comfast,cf-e314n-v2", "qca,qca9531";
@@ -23,37 +24,40 @@
                pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
                wan {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "red:signal1";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "red:signal2";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "green:signal3";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+                       label = "green:rssimediumhigh";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "green:signal4";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+                       label = "green:rssihigh";
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -108,6 +112,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -149,17 +167,3 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};