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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_planex_mzk-ex300np.dts

diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
index 3313c6c071c5eb8d06aeb9ae12744e23063ee77c..754abf879ae9892ecc1dc90bc77715d91c51df6a 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
@@ -1,9 +1,8 @@
-/dts-v1/;
-
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "planex,mzk-ex300np", "ralink,mt7620a-soc";
@@ -20,32 +19,33 @@
                compatible = "gpio-leds";
 
                wifi {
-                       label = "mzk-ex300np:green:wifi";
+                       label = "green:wifi";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                led_wps: wps {
-                       label = "mzk-ex300np:green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
 
                rep {
-                       label = "mzk-ex300np:blue:rep";
+                       label = "blue:rep";
                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                };
 
                wifi1 {
-                       label = "mzk-ex300np:blue:wifi1";
+                       label = "blue:wifi1";
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                };
 
                wifi2 {
-                       label = "mzk-ex300np:blue:wifi2";
+                       label = "blue:wifi2";
                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
                };
 
                wifi3 {
-                       label = "mzk-ex300np:blue:wifi3";
+                       label = "blue:wifi3";
                        gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -78,7 +78,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -104,6 +104,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 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -122,18 +136,22 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
-               ralink,function = "gpio";
+               groups = "i2c", "spi refclk", "rgmii1", "wled";
+               function = "gpio";
        };
 };
 
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x4>;
+
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "llllw";
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };