X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7621_tplink_tl-wpa8631p-v3.dts;h=1e0fd2023970ca9fc8c01987ba10b21b5670090b;hb=5457996a9ea93ea1761fe29fb5809911927a508e;hp=0d466f1e6610cf6313272fd2af553409df9926e2;hpb=8d255512437ec47cc7d87d7e11480c0a287417c6;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts b/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
index 0d466f1e66..1e0fd20239 100644
--- a/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_tl-wpa8631p-v3.dts
@@ -115,12 +115,38 @@
 				label = "config";
 				reg = <0x730000 0xc0000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_2008: macaddr@2008 {
+						compatible = "mac-base";
+						reg = <0x2008 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			radio: partition@7f0000 {
 				label = "radio";
 				reg = <0x7f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_radio_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					eeprom_radio_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+				};
 			};
 		};
 	};
@@ -141,9 +167,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&radio 0x0>;
-		nvmem-cells = <&macaddr_config_2008>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 0>;
+		nvmem-cell-names = "eeprom", "mac-address";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -152,10 +177,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&radio 0x8000>;
-		nvmem-cells = <&macaddr_config_2008>;
-		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 1>;
+		nvmem-cell-names = "eeprom", "mac-address";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -165,7 +188,7 @@
 };
 
 &gmac0 {
-	nvmem-cells = <&macaddr_config_2008>;
+	nvmem-cells = <&macaddr_config_2008 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -192,13 +215,3 @@
 		};
 	};
 };
-
-&config {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_config_2008: macaddr@2008 {
-		reg = <0x2008 0x6>;
-	};
-};