mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

ath79: provide label MAC address 

This patch adds the label MAC address for several devices in
ath79.

Some devices require setting the MAC address in 02_network:

For the following devices, the netif device can be linked in
device tree, but the MAC address cannot be read:
- alfa-network,ap121f
- avm,fritz300e
- ubnt-xm devices

For the following devices, label MAC address is tied to lan or
wan, so no node to link to exists in device tree:
- adtran,bsap1800-v2
- adtran,bsap1840
- dlink,dir-842-c1/-c2/-c3
- engenius,ecb1750
- iodata,etg3-r
- iodata,wn-ac1167dgr
- iodata,wn-ac1600dgr
- iodata,wn-ac1600dgr2
- iodata,wn-ag300dgr
- nec,wg800hp
- nec,wg1200cr
- trendnet,tew-823dru

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2019-08-15 15:13:33 +02:00 committed by Petr Štetiar
parent 469e347f19
commit 50fdc0374b
54 changed files with 123 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
target/linux/ath79/base-files/etc/board.d/02_network
View File

@ -314,9 +314,19 @@ ath79_setup_macs()
adtran,bsap1800-v2|\
adtran,bsap1840)
lan_mac=$(mtd_get_mac_binary "Board data" 2)
label_mac=$lan_mac
;;
alfa-network,ap121f|\
ubnt,airrouter|\
ubnt,bullet-m|\
ubnt,nanostation-m|\
ubnt,rocket-m|\
ubnt,unifi)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;;
avm,fritz300e)
lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)"))
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
;;
avm,fritz4020)
lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)"))
@ -334,8 +344,13 @@ ath79_setup_macs()
dlink,dir-842-c1|\
dlink,dir-842-c2|\
dlink,dir-842-c3|\
nec,wg1200cr)
lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
label_mac=$lan_mac
;;
dlink,dir-859-a1|\
nec,wg1200cr|\
qihoo,c301|\
wd,mynet-n750)
lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
@ -346,12 +361,9 @@ ath79_setup_macs()
;;
engenius,ecb1750)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
label_mac=$(mtd_get_mac_ascii u-boot-env athaddr)
;;
engenius,epg5000|\
iodata,wn-ac1167dgr|\
iodata,wn-ac1600dgr|\
iodata,wn-ac1600dgr2|\
iodata,wn-ag300dgr)
engenius,epg5000)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
;;
@ -364,6 +376,15 @@ ath79_setup_macs()
iodata,etg3-r)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
wan_mac=$(macaddr_add "$lan_mac" -1)
label_mac=$wan_mac
;;
iodata,wn-ac1167dgr|\
iodata,wn-ac1600dgr|\
iodata,wn-ac1600dgr2|\
iodata,wn-ag300dgr)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
label_mac=$wan_mac
;;
jjplus,ja76pf2)
wan_mac=$(fconfig -s -r -d $(find_mtd_part "RedBoot config") -n alias/ethaddr)
@ -372,6 +393,7 @@ ath79_setup_macs()
nec,wg800hp)
lan_mac=$(mtd_get_mac_text board_data 0x280)
wan_mac=$(mtd_get_mac_text board_data 0x480)
label_mac=$wan_mac
;;
netgear,wndr3700|\
netgear,wndr3700v2|\
@ -382,10 +404,6 @@ ath79_setup_macs()
lan_mac=$(k2t_get_mac "lan_mac")
wan_mac=$(k2t_get_mac "wan_mac")
;;
qihoo,c301)
lan_mac=$(mtd_get_mac_ascii devdata lanmac)
wan_mac=$(mtd_get_mac_ascii devdata wanmac)
;;
rosinson,wr818)
wan_mac=$(mtd_get_mac_binary factory 0x0)
lan_mac=$(macaddr_setbit_la "$wan_mac")
@ -406,6 +424,7 @@ ath79_setup_macs()
trendnet,tew-823dru)
lan_mac=$(mtd_get_mac_text mac 0x4)
wan_mac=$(mtd_get_mac_text mac 0x18)
label_mac=$wan_mac
;;
ubnt,routerstation|\
ubnt,routerstation-pro)
@ -419,6 +438,7 @@ ath79_setup_macs()
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
[ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
}
board_config_update

1
target/linux/ath79/dts/ar7161_aruba_ap-105.dts
View File

@ -19,6 +19,7 @@
led-failsafe = &power_red;
led-running = &power_green;
led-upgrade = &power_green;
label-mac-device = &eth0;
};
extosc: ref {

1
target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
View File

@ -12,6 +12,7 @@
led-failsafe = &power_orange;
led-running = &power_green;
led-upgrade = &power_orange;
label-mac-device = &eth0;
};
chosen {

1
target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi
View File

@ -11,6 +11,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &ath9k;
};
keys {

1
target/linux/ath79/dts/ar7241_tplink.dtsi
View File

@ -11,6 +11,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &ath9k;
};
keys {

1
target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &ath9k;
};
keys {

1
target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
View File

@ -12,6 +12,7 @@
led-failsafe = &globe;
led-running = &globe;
led-upgrade = &globe;
label-mac-device = &wifi;
};
airrouter-leds {

3
target/linux/ath79/dts/ar7241_ubnt_unifi.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &dome_green;
led-running = &dome_green;
led-upgrade = &dome_green;
label-mac-device = &wifi;
};
extosc: ref {
@ -110,7 +111,7 @@
&pcie {
status = "okay";
wifi@0,0 {
wifi: wifi@0,0 {
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
};

2
target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
View File

@ -89,7 +89,7 @@
&pcie {
status = "okay";
wifi@0,0 {
wifi: wifi@0,0 {
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
};

1
target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
View File

@ -9,6 +9,7 @@
aliases {
led-boot = &link4;
led-failsafe = &link4;
label-mac-device = &wifi;
};
leds {

1
target/linux/ath79/dts/ar7242_avm_fritz300e.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
label-mac-device = &ath9k;
};
keys {

4
target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
View File

@ -10,6 +10,10 @@
compatible = "buffalo,wzr-hp-g450h", "qca,ar7242";
model = "Buffalo WZR-HP-G450H/WZR-450HP";
aliases {
label-mac-device = &eth0;
};
ath9k-leds {
compatible = "gpio-leds";

1
target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
chosen {

1
target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
extosc: ref {

1
target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
extosc: ref {

1
target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth0;
};
keys {

1
target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
View File

@ -15,6 +15,7 @@
led-boot = &wlan;
led-failsafe = &wlan;
led-upgrade = &wlan;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/ar9331_8dev_carambola2.dts
View File

@ -12,6 +12,7 @@
aliases {
serial0 = &uart;
label-mac-device = &wmac;
};
leds {

1
target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
View File

@ -16,6 +16,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &wmac;
};
keys {

1
target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
View File

@ -13,6 +13,7 @@
aliases {
led-boot = &led_lan;
led-failsafe = &led_lan;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
View File

@ -13,6 +13,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
keys {

1
target/linux/ath79/dts/ar9331_tplink_tl-wr710n-v1.dts
View File

@ -16,6 +16,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth0;
};
keys {

1
target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &wmac;
};
keys {

1
target/linux/ath79/dts/ar9341_tplink.dtsi
View File

@ -13,6 +13,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &wmac;
};
keys: keys {

1
target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
View File

@ -14,6 +14,7 @@
led-running = &system;
led-upgrade = &system;
led-failsafe = &system;
label-mac-device = &wmac;
};
leds {

1
target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
View File

@ -15,6 +15,7 @@
led-boot = &wan;
led-failsafe = &wan;
led-upgrade = &wan;
label-mac-device = &eth0;
};
leds {

4
target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi
View File

@ -7,6 +7,10 @@
#include "ar9344.dtsi"
/ {
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
View File

@ -6,6 +6,10 @@
/ {
model = "TP-Link TL-WDR3500 v1";
compatible = "tplink,tl-wdr3500-v1", "qca,ar9344";
aliases {
label-mac-device = &wmac;
};
};
&leds {

6
target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
View File

@ -2,6 +2,12 @@
#include "ar9344_tplink_tl-wdrxxxx.dtsi"
/ {
aliases {
label-mac-device = &ath9k;
};
};
&leds {
usb1 {
label = "tp-link:green:usb1";

4
target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
View File

@ -10,6 +10,10 @@
compatible = "comfast,cf-e5", "qca,qca9531";
model = "COMFAST CF-E5/E7";
aliases {
label-mac-device = &eth0;
};
keys {
compatible = "gpio-keys-polled";
poll-interval = <20>;

1
target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
View File

@ -11,6 +11,7 @@
led-failsafe = &led_status;
led-running = &led_status;
led-upgrade = &led_status;
label-mac-device = &eth0;
};
keys {

4
target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
View File

@ -10,6 +10,10 @@
compatible = "glinet,gl-ar750", "qca,qca9531";
model = "GL.iNet GL-AR750";
aliases {
label-mac-device = &eth0;
};
keys {
compatible = "gpio-keys";

4
target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
View File

@ -10,6 +10,10 @@
compatible = "tplink,archer-d50-v1", "qca,qca9531";
model = "TP-Link Archer D50 v1";
aliases {
label-mac-device = &wmac;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};

1
target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
leds {

4
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
View File

@ -11,6 +11,10 @@
bootargs = "console=ttyS0,115200n8";
};
aliases {
label-mac-device = &wmac;
};
gpio_leds: leds {
compatible = "gpio-leds";

1
target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
View File

@ -15,6 +15,7 @@
led-failsafe = &power_led;
led-running = &power_led;
led-upgrade = &power_led;
label-mac-device = &eth1;
};
gpio_leds: leds {

4
target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
View File

@ -10,6 +10,10 @@
compatible = "ubnt,acb-isp", "qca,qca9533";
model = "Ubiquiti airCube ISP";
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";

1
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth1;
};
gpio_leds: leds {

1
target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &power_amber;
led-running = &power_green;
led-upgrade = &power_amber;
label-mac-device = &eth0;
};
led_spi {

1
target/linux/ath79/dts/qca9558_ocedo_koala.dts
View File

@ -19,6 +19,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth1;
};
gpio_leds: leds {

1
target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
View File

@ -17,6 +17,7 @@
led-running = &led_power;
led-upgrade = &led_power;
mdio-gpio0 = &mdio2;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
View File

@ -19,6 +19,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth1;
};
gpio_leds: leds {

1
target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &wmac;
};
leds {

1
target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
View File

@ -19,6 +19,7 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
View File

@ -55,6 +55,7 @@
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
View File

@ -13,6 +13,7 @@
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
label-mac-device = &eth1;
};
chosen {

1
target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
View File

@ -19,6 +19,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
led_spi {

1
target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
label-mac-device = &eth0;
};
leds {

1
target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &eth0;
};
gpio_leds: leds {

1
target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
View File

@ -16,6 +16,7 @@
led-failsafe = &system;
led-running = &system;
led-upgrade = &system;
label-mac-device = &wmac;
};
gpio_leds: leds {

6
target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
View File

@ -2,6 +2,12 @@
#include "qca9563_ubnt_unifiac.dtsi"
/ {
aliases {
label-mac-device = &eth0;
};
};
&mdio0 {
status = "okay";

6
target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
View File

@ -2,6 +2,12 @@
#include "qca9563_ubnt_unifiac.dtsi"
/ {
aliases {
label-mac-device = &eth0;
};
};
&mdio0 {
status = "okay";
phy-mask = <0>;