Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ramips: MSG1500 X.00: switch to mac-address-ascii dts

Browse source 
The Config partition of some machines is special, and the openwrt script
cannot read the protest_lan_mac correctly. This problem can be solved by
reading the mac address (ascii) in dts.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
This commit is contained in:
Chukun Pan 2022-10-19 23:16:30 +08:00 committed by Christian Marangi
parent 1f68baf5f0
commit 31c15813f9
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
3 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts
View file

@ -13,6 +13,7 @@
led-boot = &led_usb; led-boot = &led_usb;
led-failsafe = &led_usb; led-failsafe = &led_usb;
led-upgrade = &led_usb; led-upgrade = &led_usb;
label-mac-device = &gmac0;
}; };
leds { leds {
@ -79,12 +80,32 @@
label = "Config"; label = "Config";
reg = <0x80000 0x80000>; reg = <0x80000 0x80000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_8014: macaddr@8014 {
reg = <0x8014 0x11>;
};
macaddr_config_8036: macaddr@8036 {
reg = <0x8036 0x11>;
};
}; };
factory: partition@100000 { factory: partition@100000 {
label = "Factory"; label = "Factory";
reg = <0x100000 0x40000>; reg = <0x100000 0x40000>;
read-only; read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_4: macaddr@4 {
reg = <0x4 0x6>;
};
}; };
partition@140000 { partition@140000 {
@ -115,10 +136,18 @@
}; };
}; };
&gmac0 {
nvmem-cells = <&macaddr_config_8014>;
nvmem-cell-names = "mac-address-ascii";
};
&gmac1 { &gmac1 {
status = "okay"; status = "okay";
label = "wan"; label = "wan";
phy-handle = <&ethphy4>; phy-handle = <&ethphy4>;
nvmem-cells = <&macaddr_config_8036>;
nvmem-cell-names = "mac-address-ascii";
}; };
&mdio { &mdio {
@ -157,13 +186,3 @@
function = "gpio"; function = "gpio";
}; };
}; };
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_4: macaddr@4 {
reg = <0x4 0x6>;
};
};

5
target/linux/ramips/mt7621/base-files/etc/board.d/02_network
View file

@ -277,11 +277,6 @@ ramips_setup_macs()
wan_mac=$(macaddr_add "$lan_mac" 1) wan_mac=$(macaddr_add "$lan_mac" 1)
label_mac=$lan_mac label_mac=$lan_mac
;; ;;
raisecom,msg1500-x-00)
lan_mac=$(mtd_get_mac_ascii Config protest_lan_mac)
wan_mac=$(mtd_get_mac_ascii Config protest_wan_mac)
label_mac=$lan_mac
;;
yuncore,ax820) yuncore,ax820)
label_mac=$(mtd_get_mac_binary Factory 0x4) label_mac=$(mtd_get_mac_binary Factory 0x4)
;; ;;

3
target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View file

@ -141,8 +141,7 @@ case "$board" in
;; ;;
raisecom,msg1500-x-00) raisecom,msg1500-x-00)
[ "$PHYNBR" = "0" ] && \ [ "$PHYNBR" = "0" ] && \
macaddr_setbit_la "$(mtd_get_mac_ascii Config protest_lan_mac)" \ macaddr_setbit_la "$(get_mac_label)" > /sys${DEVPATH}/macaddress
> /sys${DEVPATH}/macaddress
;; ;;
snr,snr-cpe-me2-sfp) snr,snr-cpe-me2-sfp)
hw_mac_addr="$(mtd_get_mac_binary factory 0x8004)" hw_mac_addr="$(mtd_get_mac_binary factory 0x8004)"