X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7628an_tplink_tl-wr841n-v14.dts;h=c19db91620e76ca71f3bc2d6bfb4acb4e710e0e1;hp=6e12361ec9788cd9bccfa66bcee8d60f18f4a4e2;hb=HEAD;hpb=b97a99256fe54e81c8fc6c60183f46fbf731bbf8

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 6e12361ec9..c6c6fbd906 100644
--- 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,26 +14,18 @@
 		led-boot = &led_wlan;
 		led-failsafe = &led_wlan;
 		led-upgrade = &led_wlan;
-
-		led-wlan = &led_wlan;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x2000000>;
-	};
-
 	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
+		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
-			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -42,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>;
 		};
 	};
 };
@@ -71,7 +67,6 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
-		m25p,chunked-io = <32>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -90,10 +85,24 @@
 				reg = <0x10000 0x3e0000>;
 			};
 
-			factory: partition@3f0000 {
+			partition@3f0000 {
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -109,28 +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";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt";
-			ralink,function = "gpio";
-		};
+&esw {
+	mediatek,portmap = <0x3e>;
+};
+
+&state_default {
+	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;
 	};
 };