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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7628an_tplink_tl-wr841n-v14.dts

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
index 6268bd13cc7f0e350cd0f72ce1d6f79878991518..11f3552e5f697f9e44b525182cd536a67caa2ab0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7628an.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "tplink,tl-wr841n-v14", "mediatek,mt7628an-soc";
@@ -14,8 +14,6 @@
                led-boot = &led_wlan;
                led-failsafe = &led_wlan;
                led-upgrade = &led_wlan;
-
-               led-wlan = &led_wlan;
        };
 
        chosen {
@@ -27,7 +25,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -36,24 +34,28 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tl-wr841n-v14:green:lan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
-                       label = "tl-wr841n-v14:green:wan";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
-                       label = "tl-wr841n-v14:green:wlan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_orange {
-                       label = "tl-wr841n-v14:orange:wan";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_ORANGE>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -65,7 +67,6 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
-               m25p,chunked-io = <32>;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -88,6 +89,20 @@
                                label = "factory";
                                reg = <0x3f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       macaddr_factory_f100: macaddr@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -103,26 +118,31 @@
 
 &wmac {
        status = "okay";
-       mtd-mac-address = <&factory 0xf100>;
-       mediatek,mtd-eeprom = <&factory 0x10000>;
+
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0xf100>;
-       mediatek,portmap = "wllll";
+       nvmem-cells = <&macaddr_factory_f100>;
+       nvmem-cell-names = "mac-address";
+};
+
+&esw {
+       mediatek,portmap = <0x3e>;
 };
 
 &state_default {
        gpio {
-               ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt";
-               ralink,function = "gpio";
+               groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt";
+               function = "gpio";
        };
 };
 
-&gpio1 {
+&gpio {
        led_wlan_enable {
                gpio-hog;
-               gpios = <11 GPIO_ACTIVE_HIGH>;
+               gpios = <43 GPIO_ACTIVE_HIGH>;
                output-high;
        };
 };