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

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7628an_zbtlink_zbt-we1226.dts

diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
index fb620eae3ea174e64a3cf58e383b39ed1485145c..976994f5389379de0d1768db2d6c5ea0d6b1109f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
@@ -1,9 +1,9 @@
-/dts-v1/;
+#include "mt7628an.dtsi"
+
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 
-#include "mt7628an.dtsi"
-
 / {
        compatible = "zbtlink,zbt-we1226", "mediatek,mt7628an-soc";
        model = "Zbtlink ZBT-WE1226";
@@ -24,7 +24,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -33,38 +33,40 @@
                compatible = "gpio-leds";
 
                wan {
-                       label = "zbt-we1226:green:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "zbt-we1226:green:lan1";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       label = "green:lan1";
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "zbt-we1226:green:lan2";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       label = "green:lan2";
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
-                       label = "zbt-we1226:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };
 
 &state_default {
        gpio {
-               ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
-               ralink,function = "gpio";
+               groups = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
+               function = "gpio";
        };
 };
 
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -90,6 +92,20 @@
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       macaddr_factory_2e: macaddr@2e {
+                                               reg = <0x2e 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -103,10 +119,14 @@
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x2e>;
+       nvmem-cells = <&macaddr_factory_2e>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {