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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7620a_wavlink_wl-wn530hg4.dts

diff --git a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn530hg4.dts b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn530hg4.dts
index 27fd2e2450d850dc390fbf1413c95f17f553b83e..13f4c4c362681aa1f181b14afd3c59b689f2131b 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn530hg4.dts
+++ b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn530hg4.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "wavlink,wl-wn530hg4", "ralink,mt7620a-soc";
@@ -20,17 +21,20 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                };
 
                status_yellow {
-                       label = "yellow:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_YELLOW>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
 
                status_red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -75,6 +79,24 @@
                                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>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_28: macaddr@28 {
+                                               reg = <0x28 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -97,7 +119,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii2_pins &mdio_pins>;
 
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
 
        mediatek,portmap = "llllw";
 
@@ -124,14 +147,16 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
 &wmac {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "pa_gpio";
        pinctrl-0 = <&pa_pins>;
-
-       ralink,mtd-eeprom = <&factory 0x0>;
+       pinctrl-1 = <&pa_gpio_pins>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };