From: Mikhail Zhilkin <csharper2005@gmail.com>
Date: Thu, 13 Jun 2024 15:33:20 +0000 (+0000)
Subject: ramips: fix wrong eeprom data for sercomm dxx devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=24d2519755256fb6382a95a360eb58f5105b383e;p=openwrt%2Fstaging%2Fnbd.git

ramips: fix wrong eeprom data for sercomm dxx devices

This commit fixes wrong WiFi eeprom data:
   /sys/kernel/debug/ieee80211/phy0/mt76/eeprom
   /sys/kernel/debug/ieee80211/phy1/mt76/eeprom

Fixes: fb4cea45ec55 ("ramips: convert MT7603 EEPROM to NVMEM format")
Signed-off-by: Mikhail Zhilkin <csharper2005@gmail.com>
---

diff --git a/target/linux/ramips/dts/mt7621_beeline_smartbox-turbo.dts b/target/linux/ramips/dts/mt7621_beeline_smartbox-turbo.dts
index f9b53ae0b3..eee7ab65db 100644
--- a/target/linux/ramips/dts/mt7621_beeline_smartbox-turbo.dts
+++ b/target/linux/ramips/dts/mt7621_beeline_smartbox-turbo.dts
@@ -9,15 +9,15 @@
 
 &pcie0 {
 	wifi@0,0 {
-		nvmem-cells = <&macaddr_factory_21000 5>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000 5>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
 &pcie1 {
 	wifi@0,0 {
-		nvmem-cells = <&macaddr_factory_21000 4>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000 4>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_rostelecom_rt-sf-1.dts b/target/linux/ramips/dts/mt7621_rostelecom_rt-sf-1.dts
index b722df5bbb..1932a12548 100644
--- a/target/linux/ramips/dts/mt7621_rostelecom_rt-sf-1.dts
+++ b/target/linux/ramips/dts/mt7621_rostelecom_rt-sf-1.dts
@@ -9,15 +9,15 @@
 
 &pcie0 {
 	wifi@0,0 {
-		nvmem-cells = <&macaddr_factory_21000 3>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000 3>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
 &pcie1 {
 	wifi@0,0 {
-		nvmem-cells = <&macaddr_factory_21000 2>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000 2>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi b/target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi
index b13b621d2f..4e22e45191 100644
--- a/target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi
+++ b/target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi
@@ -181,8 +181,7 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		nvmem-cells = <&eeprom_factory_8000>;
-		nvmem-cell-names = "eeprom";
+
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -191,8 +190,7 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		nvmem-cells = <&eeprom_factory_0>;
-		nvmem-cell-names = "eeprom";
+
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };