X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2Fmt7621_beeline_smartbox-giga.dts;h=f2a99a63a89db765a8f56ec883494ac6da11bf35;hb=f547fc9d579e894257cccfebec3a374e27e69e0c;hp=22fc065eb299076e86533f371faf1a8c9f98fc22;hpb=f1c9afd801380a05a91d979b475c76cc0a67caae;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts b/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
index 22fc065eb2..f2a99a63a8 100644
--- a/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
+++ b/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
@@ -99,12 +99,24 @@
 			sercomm,scpart-id = <2>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			macaddr_factory_21000: macaddr@21000 {
-				reg = <0x21000 0x6>;
+			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 0x4da8>;
+				};
+
+				macaddr_factory_21000: macaddr@21000 {
+					compatible = "mac-base";
+					reg = <0x21000 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
 			};
 		};
 
@@ -175,12 +187,10 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 
-		nvmem-cells = <&macaddr_factory_21000>;
-		nvmem-cell-names = "mac-address";
-		mac-address-increment = <(5)>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000 5>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
@@ -188,17 +198,15 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
 		ieee80211-freq-limit = <2400000 2500000>;
 
-		nvmem-cells = <&macaddr_factory_21000>;
-		nvmem-cell-names = "mac-address";
-		mac-address-increment = <(4)>;
+		nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000 4>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
 &gmac0 {
-	nvmem-cells = <&macaddr_factory_21000>;
+	nvmem-cells = <&macaddr_factory_21000 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -207,9 +215,8 @@
 	label = "wan";
 	phy-handle = <&ethphy0>;
 
-	nvmem-cells = <&macaddr_factory_21000>;
+	nvmem-cells = <&macaddr_factory_21000 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(1)>;
 };
 
 &mdio {