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 2f2dbb05f8d891b5e3caa353867ec15726b9226d..8251fe595c5d21ac1e2c3fd00725daa0fe9e9c96 100644 (file)
--- 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 3f730808dd64dfa36284e9d3e11c72039f3806e2..c1e3a0889700a410e3827e05fd106acc3f7a2f96 100644 (file)
--- 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 4ac1cd092a1406a8bcfa5221b7778145cdcd7378..5accbbdbd8e79a9286316c6d8482a118fb963a87 100644 (file)
--- 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 03bfd7d442871ef87dbbc6fbfda22067ec153c58..52af14723e40fe18352c023caa443a17233c17ec 100644 (file)
--- 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>;
        };
 };