From: David Bauer <mail@david-bauer.net>
Date: Thu, 30 Jan 2020 11:37:28 +0000 (+0100)
Subject: Revert "ramips: fix NETGEAR R6260 EEPROM offset"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0cf889db00f81575568b19cb470e97aad7765f32;p=openwrt%2Fstaging%2Fjow.git

Revert "ramips: fix NETGEAR R6260 EEPROM offset"

This reverts commit 4716c843d62a5a4c37e7886f54bcf446aa26e786.

Netgear seems to use different partition layouts on the R6260, which
would require us to dynamically detect the position of (at least) the
factory partition.

Revert this fix to avoid breaking existing installations until a better
solution has been worked out.

Signed-off-by: David Bauer <mail@david-bauer.net>
---

diff --git a/target/linux/ramips/dts/mt7621_netgear_r6260.dts b/target/linux/ramips/dts/mt7621_netgear_r6260.dts
index 2f2dbb05f8..8251fe595c 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6260.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6260.dts
@@ -23,11 +23,3 @@
 &led_wifi {
 	label = "r6260:green:wifi";
 };
-
-&wifi2 {
-	mediatek,mtd-eeprom = <&factory 0x20000>;
-};
-
-&wifi5 {
-	mediatek,mtd-eeprom = <&factory 0x28000>;
-};
diff --git a/target/linux/ramips/dts/mt7621_netgear_r6350.dts b/target/linux/ramips/dts/mt7621_netgear_r6350.dts
index 3f730808dd..c1e3a08897 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6350.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6350.dts
@@ -23,11 +23,3 @@
 &led_wifi {
 	label = "r6350:green:wifi";
 };
-
-&wifi2 {
-	mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&wifi5 {
-	mediatek,mtd-eeprom = <&factory 0x8000>;
-};
diff --git a/target/linux/ramips/dts/mt7621_netgear_r6850.dts b/target/linux/ramips/dts/mt7621_netgear_r6850.dts
index 4ac1cd092a..5accbbdbd8 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6850.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6850.dts
@@ -23,11 +23,3 @@
 &led_wifi {
 	label = "r6850:green:wifi";
 };
-
-&wifi2 {
-	mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&wifi5 {
-	mediatek,mtd-eeprom = <&factory 0x8000>;
-};
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
index 03bfd7d442..52af14723e 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@@ -78,17 +78,19 @@
 };
 
 &pcie0 {
-	wifi5: wifi@0,0 {
+	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
 
 &pcie1 {
-	wifi2: wifi@0,0 {
+	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x0>;
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };