X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7620a_alfa-network_r36m-e4g.dts;h=09afc018e8d28ab3bc936686a035214e87553ad7;hb=be7f9ad4ddb6a4cd22b128f8e8d424f445e299a8;hp=b0ac4a37d4690bdb141b137055f1c8e4276cbde8;hpb=b756ea2a909a36d7e931b96edf0d15539421c733;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts
index b0ac4a37d4..09afc018e8 100644
--- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7620a.dtsi"
 
@@ -82,40 +81,40 @@
 		compatible = "gpio-leds";
 
 		4g {
-			label = "r36m-e4g:orange:4g";
+			label = "orange:4g";
 			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "r36m-e4g:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "r36m-e4g:green:system";
+			label = "green:system";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim1 {
-			label = "r36m-e4g:green:sim1";
+			label = "green:sim1";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim2 {
-			label = "r36m-e4g:green:sim2";
+			label = "green:sim2";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wan {
-			label = "r36m-e4g:green:wan";
+			label = "green:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "r36m-e4g:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0radio";
 		};
@@ -127,7 +126,8 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x28>;
+	nvmem-cells = <&macaddr_factory_28>;
+	nvmem-cell-names = "mac-address";
 };
 
 &gpio1 {
@@ -142,10 +142,6 @@
 	status = "okay";
 };
 
-&gsw {
-	mediatek,port4 = "ephy";
-};
-
 &i2c {
 	status = "okay";
 };
@@ -212,5 +208,15 @@
 };
 
 &wmac {
-	ralink,mtd-eeprom = <&factory 0>;
+	ralink,mtd-eeprom = <&factory 0x0>;
+};
+
+&factory {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_factory_28: macaddr@28 {
+		reg = <0x28 0x6>;
+	};
 };