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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_iodata_wnpr2600g.dts

diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
index b49bfd785ade984b5cf38ad9c072a943fbecb911..08d59e534f61f184dd16b1a76b99bd79b0e53825 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "iodata,wnpr2600g", "mediatek,mt7621-soc";
@@ -17,32 +17,29 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "wnpr2600g:green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                notification {
-                       label = "wnpr2600g:green:notification";
+                       label = "green:notification";
                        gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
                };
 
                wlan2g {
-                       label = "wnpr2600g:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0radio";
                };
 
                wlan5g {
-                       label = "wnpr2600g:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy1radio";
                };
@@ -101,6 +98,24 @@
                                label = "factory";
                                reg = <0x040000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -124,15 +139,54 @@
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0x4>;
-       mediatek,portmap = "wllll";
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy0>;
+
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
+&switch0 {
+       ports {
+               port@1 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan1";
+               };
+       };
 };
 
 &state_default {
        gpio {
-               ralink,group = "uart2", "uart3", "jtag", "wdt";
-               ralink,function = "gpio";
+               groups = "uart2", "uart3", "jtag", "wdt";
+               function = "gpio";
        };
 };
 
@@ -144,7 +198,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -153,7 +208,8 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                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>;
        };
 };