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

[openwrt/openwrt.git] / target / linux / lantiq / files / arch / mips / boot / dts / lantiq / ar9_buffalo_wbmr-hp-g300h.dts

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 5419215dc63501c58a0df6de73bc5f67bed85197..5a50f27c08b059799a2bafa3474631ed52f69c6b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -1,8 +1,7 @@
-/dts-v1/;
-
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,wbmr-hp-g300h", "lantiq,xway", "lantiq,ar9";
@@ -59,40 +58,43 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "wbmr:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "wbmr:red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                security {
-                       label = "wbmr:yellow:security";
+                       label = "yellow:security";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "wbmr:green:wireless";
+                       label = "green:wireless";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
                dsl: dsl {
-                       label = "wbmr:green:dsl";
+                       label = "green:dsl";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
                online_green: online {
-                       label = "wbmr:green:internet";
+                       label = "green:internet";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
                online2 {
-                       label = "wbmr:red:internet";
+                       label = "red:internet";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
                movie {
-                       label = "wbmr:blue:movie";
+                       label = "blue:movie";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "wbmr:green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
@@ -137,7 +139,8 @@
 
 &gsw {
        phy-mode = "rgmii";
-       mtd-mac-address = <&boardconfig 0x10024>;
+       nvmem-cells = <&macaddr_boardconfig_10024>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pci0 {
@@ -162,7 +165,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };
@@ -176,6 +179,16 @@
                                label = "board";
                                reg = <0x1fc0000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_boardconfig_10024: macaddr@10024 {
+                                               reg = <0x10024 0x6>;
+                                       };
+                               };
                        };
 
                        partition@1fe0000 {