2
0
Эх сурвалжийг харах

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 <[email protected]>
Fixes: b28e94d4bfa1 ("ramips: MiWiFi Nano fixes")
Signed-off-by: Adrian Schmutzler <[email protected]>
Adrian Schmutzler 6 жил өмнө
parent
commit
09d38a3bc3

+ 0 - 1
target/linux/ramips/dts/mt7628an_cudy_wr1000.dts

@@ -132,7 +132,6 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

+ 0 - 1
target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts

@@ -93,5 +93,4 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };

+ 0 - 1
target/linux/ramips/dts/mt7628an_totolink_lr1200.dts

@@ -108,7 +108,6 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

+ 0 - 1
target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi

@@ -21,7 +21,6 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

+ 0 - 1
target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts

@@ -68,7 +68,6 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

+ 0 - 1
target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts

@@ -103,7 +103,6 @@
 
 &wmac {
 	status = "okay";
-	ralink,mtd-eeprom = <&factory 0x4>;
 };
 
 &ethernet {

+ 2 - 2
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)