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

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9330_openmesh_om2p.dtsi

diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
index e010e5cad0c133a402ecaa05ae68b34ad6637ef9..38704f91697164cabd901f92ad2ff3f33d845de1 100644 (file)
--- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
+++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        chosen {
@@ -40,13 +41,15 @@
                };
 
                led_power_blue: power_blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                lan_blue {
-                       label = "blue:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
@@ -62,7 +65,8 @@
                };
 
                wan_blue {
-                       label = "blue:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -122,6 +126,20 @@
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                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>;
+                                       };
+                               };
                        };
                };
        };
@@ -146,17 +164,3 @@
 
        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>;
-       };
-};