From: Shiji Yang <yangshiji66@qq.com>
Date: Tue, 16 Jan 2024 12:42:59 +0000 (+0800)
Subject: ramips: mt7621: convert I-O DATA devices EEPROM to NVMEM format
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=cd9088c6f943b685c5060e2acf772ed479710f20;p=openwrt%2Fstaging%2Fdangole.git

ramips: mt7621: convert I-O DATA devices EEPROM to NVMEM format

-+-------------------------------------------+-
 |          Model          |       NIC       |
-+-------------------------------------------+-
 | WN-DX1167R/WN-AX1167GR2 |     MT7615D     |
-+-------------------------------------------+-
 | WN-AX2033GR/WN-DX2033GR | MT7603 + MT7615 |
-+-------------------------------------------+-

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
---

diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr2.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr2.dts
index 8e778ce4fe3..8936258409b 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr2.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr2.dts
@@ -7,6 +7,11 @@
 	model = "I-O DATA WN-AX1167GR2";
 };
 
+/* override EEPROM size to 0x4da8 for MT7615 */
+&eeprom_factory_0 {
+	reg = <0x0 0x4da8>;
+};
+
 &partitions {
 	partition@6b00000 {
 		label = "Backup";
@@ -19,6 +24,7 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts
index eb6908629ae..017d977d449 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts
@@ -19,8 +19,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-
-		mediatek,mtd-eeprom = <&factory 0x0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2483000>;
 	};
 };
@@ -29,8 +29,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 5710000>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-dx1167r.dts b/target/linux/ramips/dts/mt7621_iodata_wn-dx1167r.dts
index 4492f43f9fb..c8aaa80b542 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-dx1167r.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-dx1167r.dts
@@ -7,6 +7,11 @@
 	model = "I-O DATA WN-DX1167R";
 };
 
+/* override EEPROM size to 0x4da8 for MT7615 */
+&eeprom_factory_0 {
+	reg = <0x0 0x4da8>;
+};
+
 &partitions {
 	partition@6b00000 {
 		label = "idmkey";
@@ -25,6 +30,7 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-dx2033gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-dx2033gr.dts
index ce02def7ffe..728deeba98d 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-dx2033gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-dx2033gr.dts
@@ -25,7 +25,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2483000>;
 	};
 };
@@ -34,7 +35,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 5710000>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
index f25d2db9b30..5ed92cf0e7d 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
@@ -86,6 +86,14 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};