aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-12-22 16:51:19 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-12-27 18:00:06 +0100
commit09d38a3bc328d122b0d84fcf6bb53d2bce7373b6 (patch)
tree3b59e06f5fbf2213b67cb904bd100fa7084229d5 /target
parentea980fb9c6de24350976dcc6c20da2bed5fc8cb8 (diff)
downloadupstream-09d38a3bc328d122b0d84fcf6bb53d2bce7373b6.tar.gz
upstream-09d38a3bc328d122b0d84fcf6bb53d2bce7373b6.tar.bz2
upstream-09d38a3bc328d122b0d84fcf6bb53d2bce7373b6.zip
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>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ramips/dts/mt7628an_cudy_wr1000.dts1
-rw-r--r--target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts1
-rw-r--r--target/linux/ramips/dts/mt7628an_totolink_lr1200.dts1
-rw-r--r--target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi1
-rw-r--r--target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts1
-rw-r--r--target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts1
-rwxr-xr-xtarget/linux/ramips/mt76x8/base-files/etc/board.d/02_network4
7 files changed, 2 insertions, 8 deletions
diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index 2d70e1225b..acaffecf8d 100644
--- 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 66e6c94b31..01fe7025bb 100644
--- 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 1e99ba368a..55c1ff03e3 100644
--- 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 918951c35f..a0056dcedb 100644
--- 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 bd3fc967f1..92bb8b7288 100644
--- 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 e537be0a80..b558a0057f 100644
--- 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 df795e5a36..90eec9c8a0 100755
--- 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)