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

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

diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index a25f4d8d2855b3254c472755c80727589666f192..a18fdd27c8e2aae0014b7c32ccd1189acd9ea809 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "wiznet,wizfi630s", "mediatek,mt7628an-soc";
@@ -31,7 +32,8 @@
                };
 
                ledwps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
@@ -49,9 +51,6 @@
        keys {
                compatible = "gpio-keys";
 
-               #address-cells = <1>;
-               #size-cells = <0>;
-
                reset {
                        label = "reset";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
@@ -97,6 +96,7 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <40000000>;
+               broken-flash-reset;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -119,6 +119,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 {
@@ -159,14 +173,7 @@
 
 &wmac {
        status = "okay";
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
 
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };