X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7628an_cudy_wr1000.dts;h=883459d2f303ec52ee5312065e9e96e46a9f6440;hb=c5a399f372535886582f89f3da624ae7465c8ff4;hp=074a5ab1ae8cdf774cb4afed184afa5a3db8c930;hpb=7140394903b1bfbbb589dafa524e2dbd6cd79862;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index 074a5ab1ae..883459d2f3 100644
--- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7628an.dtsi"
 
@@ -18,18 +17,17 @@
 	};
 
 	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>;
 		};
 
 		wps {
 			label = "rfkill";
-			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
@@ -38,29 +36,29 @@
 		compatible = "gpio-leds";
 
 		lan1 {
-			label = "wr1000:blue:lan1";
-			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+			label = "blue:lan1";
+			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "wr1000:blue:lan2";
-			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+			label = "blue:lan2";
+			gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "wr1000:blue:wan";
-			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+			label = "blue:wan";
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "wr1000:blue:wlan2g";
-			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+			label = "blue:wlan2g";
+			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_wps: wps {
-			label = "wr1000:blue:wps";
-			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+			label = "blue:wps";
+			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -94,6 +92,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 0x400>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -101,18 +117,15 @@
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
-
 		};
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2s", "refclk", "wdt", "p4led_an",
-					"p3led_an", "p2led_an", "wled_an";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		groups = "i2s", "refclk", "wdt", "p4led_an",
+				"p3led_an", "p2led_an", "wled_an";
+		function = "gpio";
 	};
 };
 
@@ -124,7 +137,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>;
 
 		led {
@@ -136,10 +150,16 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
+
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x28>;
-	mediatek,portmap = "llllw";
+	nvmem-cells = <&macaddr_factory_28>;
+	nvmem-cell-names = "mac-address";
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
 };