ramips: remove bogus ralink,mtd-eeprom with offset 0x4

Several devices in mt76x8 subtarget use the following line to set
up wmac in their DTS(I) files:

ralink,mtd-eeprom = <&factory 0x4>

This is strange for several reasons:
- They should use mediatek,mtd-eeprom on this SOC
- The caldata is supposed to start at 0x0
- The parent DTSI mt7628an.dtsi specifies mediatek,mtd-eeprom anyway,
  starting from 0x0
- The offset coincides with the default location of the MAC address
  in caldata

Based on the comment in b28e94d4bfa1 ("ramips: MiWiFi Nano fixes"),
it looks like the author for this device wanted to actually use
mtd-mac-address instead of ralink,mtd-eeprom. A check on the same
device revealed that actually the MAC address start at offset 4 there,
so the correct caldata offset is 0x0.

Based on these findings, and the fact that the expected location on
this SOC is 0x0, we remove the "ralink,mtd-eeprom = <&factory 0x4>"
statement from all devices in ramips (being only mt7628an anyway).

Thanks to Sungbo Eo for finding and researching this.

Reported-by: Sungbo Eo <mans0n@gorani.run>
Fixes: b28e94d4bfa1 ("ramips: MiWiFi Nano fixes")
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index 2d70e1225ba3f16fb33536cc67cfde2a24f53458..acaffecf8ddf9cf1d8d08d514d3682543850d3a9 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
@@ -132,7 +132,6 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
index 66e6c94b316a0151186ac63fbb9b9102bb574a83..01fe7025bb32e29d9d361a3222566a8dfd008b03 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
+++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
@@ -93,5 +93,4 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
index 1e99ba368aa055099dbb7ee0842ad3aa57e777a6..55c1ff03e314c6feb0a5ce623bf45b2f7f92227d 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
@@ -108,7 +108,6 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
index 918951c35fd909728806393cbf43bd668d2c07f7..a0056dcedb730d8e095d303e05d721adb86beb2a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
@@ -21,7 +21,6 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
index bd3fc967f1fd4f1f0d384bb1bfca9b2076a1e259..92bb8b72880a53f50d99ca9edb35e20a1d096435 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
@@ -68,7 +68,6 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
index e537be0a806ed61b1b45dc1cc709e345b7379a09..b558a0057fcfb8480ce6dfff8b11919a263a287e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
@@ -103,7 +103,6 @@
 
 &wmac {
        status = "okay";
-       ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index df795e5a3663e03c6abfee024861860a2b2c7227..90eec9c8a0bcb094dfbb907f1c41cae899f89c9d 100755 (executable)
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -134,7 +134,7 @@ ramips_setup_macs()
                ;;
        cudy,wr1000)
                wan_mac=$(mtd_get_mac_binary factory 0x2e)
-               label_mac=$(mtd_get_mac_binary factory 0x8)
+               label_mac=$(mtd_get_mac_binary factory 0x4)
                ;;
        duzun,dm06|\
        netgear,r6120|\
@@ -193,7 +193,7 @@ ramips_setup_macs()
                ;;
        vocore,vocore2|\
        vocore,vocore2-lite)
-               label_mac=$(mtd_get_mac_binary factory 0x8)
+               label_mac=$(mtd_get_mac_binary factory 0x4)
                ;;
        wavlink,wl-wn570ha1|\
        zbtlink,zbt-we1226)