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

[openwrt/openwrt.git] / target / linux / ramips / dts / rt2880_airlink101_ar670w.dts

diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
index 8a472626bdd95d0f9296f64354f755273a83a9a2..dbbaf9c45e48988d445a269371e5be988381b048 100644 (file)
--- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
+++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "rt2880.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "airlink101,ar670w", "ralink,rt2880-soc";
@@ -16,7 +15,7 @@
                led-upgrade = &led_power;
        };
 
-       cfi@bdc00000 {
+       flash@bdc00000 {
                compatible = "cfi-flash";
                reg = <0xbc400000 0x800000>;
                bank-width = <2>;
@@ -36,6 +35,20 @@
                                reg = <0x30000 0x10000>;
                                label = "factory";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
+
+                                       macaddr_factory_2004: macaddr@2004 {
+                                               reg = <0x2004 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -50,12 +63,14 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "ar670w:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wpsblue {
-                       label = "ar670w:blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -78,20 +93,17 @@
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
 &state_default {
        gpio {
-               ralink,group = "i2c", "spi", "uartlite";
-               ralink,function = "gpio";
+               groups = "i2c", "spi", "uartlite";
+               function = "gpio";
        };
 };
 
 &ethernet {
        status = "okay";
-       mtd-mac-address = <&factory 0x2004>;
+       nvmem-cells = <&macaddr_factory_2004>;
+       nvmem-cell-names = "mac-address";
 
        port@0 {
                phy-handle = <&phy0>;
@@ -109,6 +121,6 @@
 };
 
 &wmac {
-       status = "okay";
-       ralink,mtd-eeprom = <&factory 0x2000>;
+       nvmem-cells = <&eeprom_factory_2000>;
+       nvmem-cell-names = "eeprom";
 };