Skip to content

Commit

Permalink
ipq40xx: convert some boards to DSA
Browse files Browse the repository at this point in the history 
Convert IPQ40xx boards to DSA setup.

Signed-off-by: Leon M. George <leon@georgemail.eu>
Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
Signed-off-by: Nick Hainke <vincent@systemli.org>
Signed-off-by: ChunAm See <z1250747241@gmail.com>
Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
Signed-off-by: Andrew Sim <andrewsimz@gmail.com>
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  • Loading branch information
@robimarko @blocktrron
robimarko authored and blocktrron committed Oct 2, 2022
1 parent ad9ecd3 commit 550253b
Show file tree
Hide file tree
Showing 32 changed files with 754 additions and 99 deletions.
18 changes: 9 additions & 9 deletions target/linux/ipq40xx/base-files/etc/board.d/01_leds
View file
Expand Up @@ -10,7 +10,7 @@ board=$(board_name)

case "$board" in
alfa-network,ap120c-ac)
ucidef_set_led_netdev "wan" "WAN" "amber:wan" "eth1"
ucidef_set_led_netdev "wan" "WAN" "amber:wan" "wan"
;;
asus,rt-ac42u)
ucidef_set_led_switch "lan1" "LAN1" "blue:lan-1" "switch0" "0x02"
Expand All @@ -24,7 +24,7 @@ asus,rt-ac58u)
;;
avm,fritzbox-4040)
ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt"
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
ucidef_set_led_netdev "wan" "WAN" "green:wan" "wan"
ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x1e"
;;
avm,fritzbox-7530 |\
Expand Down Expand Up @@ -58,17 +58,17 @@ glinet,gl-ap1300)
mikrotik,cap-ac)
ucidef_set_led_default "power" "POWER" "blue:power" "1"
ucidef_set_led_default "user" "USER" "green:user" "0"
ucidef_set_led_switch "eth1" "ETH1" "green:eth1" "switch0" "0x20"
ucidef_set_led_switch "eth2" "ETH2" "green:eth2" "switch0" "0x10"
ucidef_set_led_netdev "eth1" "ETH1" "green:eth1" "wan"
ucidef_set_led_netdev "eth2" "ETH2" "green:eth2" "lan"
ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
;;
mikrotik,hap-ac3)
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x04"
ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "lan1"
ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "lan2"
ucidef_set_led_netdev "lan3" "LAN3" "green:lan3" "lan3"
ucidef_set_led_netdev "lan4" "LAN4" "green:lan4" "lan4"
ucidef_set_led_gpio "poe" "POE" "red:poe" "452" "0"
;;
mikrotik,sxtsq-5-ac)
Expand Down
94 changes: 44 additions & 50 deletions target/linux/ipq40xx/base-files/etc/board.d/02_network
View file
Expand Up @@ -12,28 +12,58 @@ ipq40xx_setup_interfaces()

case "$board" in
8dev,habanero-dvk|\
avm,fritzbox-4040|\
asus,rt-ac58u|\
linksys,ea6350v3|\
linksys,ea8300|\
linksys,mr8300|\
mikrotik,hap-ac2|\
mikrotik,hap-ac3|\
p2w,r619ac-64m|\
p2w,r619ac-128m|\
zyxel,nbg6617)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
;;
8dev,jalapeno|\
alfa-network,ap120c-ac|\
asus,map-ac2200|\
cilab,meshpoint-one|\
edgecore,ecw5211|\
glinet,gl-b2200|\
mikrotik,cap-ac|\
netgear,wac510)
ucidef_set_interfaces_lan_wan "lan" "wan"
;;
aruba,ap-303|\
avm,fritzrepeater-1200|\
meraki,mr33|\
meraki,mr74|\
mikrotik,lhgg-60ad|\
mikrotik,sxtsq-5-ac)
ucidef_set_interface_lan "lan"
;;
avm,fritzbox-7530)
ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
;;
cellc,rtl30vw)
ucidef_set_interface_lan "lan1 lan2"
;;
glinet,gl-b1300)
ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
;;
engenius,emr3500|\
engenius,ens620ext|\
luma,wrtq-329acn|\
netgear,wac510|\
plasmacloud,pa1200|\
plasmacloud,pa2200|\
sony,ncp-hg100-cellular)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
aruba,ap-303|\
aruba,ap-365|\
avm,fritzrepeater-1200|\
dlink,dap-2610 |\
engenius,eap1300|\
engenius,emd1|\
extreme-networks,ws-ap3915i|\
meraki,mr33|\
meraki,mr74|\
mikrotik,lhgg-60ad|\
mikrotik,sxtsq-5-ac|\
netgear,ex6100v2|\
netgear,ex6150v2|\
zyxel,wre6606)
Expand All @@ -45,43 +75,15 @@ ipq40xx_setup_interfaces()
ucidef_add_switch "switch0" \
"0u@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "0u@eth1" "5:wan"
;;
asus,map-ac2200|\
cilab,meshpoint-one|\
edgecore,ecw5211|\
edgecore,oap100|\
google,wifi|\
openmesh,a42|\
openmesh,a62)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
mikrotik,cap-ac)
ucidef_add_switch "switch0" \
"0t@eth0" "4:lan" "5:wan"
;;
asus,rt-ac42u|\
asus,rt-ac58u|\
mikrotik,hap-ac2|\
mikrotik,hap-ac3|\
p2w,r619ac-64m|\
p2w,r619ac-128m|\
zyxel,nbg6617)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
avm,fritzbox-4040|\
linksys,ea6350v3|\
linksys,ea8300)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
;;
linksys,mr8300)
asus,rt-ac42u)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan"
;;
avm,fritzbox-7530)
ucidef_add_switch "switch0" \
"0u@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
Expand All @@ -101,10 +103,8 @@ ipq40xx_setup_interfaces()
ucidef_add_switch "switch0" \
"0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1"
;;
cellc,rtl30vw)
ucidef_set_interface_lan "eth0"
ucidef_add_switch "switch0" \
"0u@eth0" "3:lan" "4:lan"
compex,wpj428)
ucidef_set_interface_lan "lan1 lan2"
;;
devolo,magic-2-wifi-next)
ucidef_set_interface_lan "eth0 eth1 eth2"
Expand All @@ -115,17 +115,11 @@ ipq40xx_setup_interfaces()
"0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "0u@eth1" "5:wan"
;;
glinet,gl-ap1300 |\
glinet,gl-b1300 |\
glinet,gl-s1300)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "3:lan" "4:lan"
;;
glinet,gl-b2200)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "1:lan" "2:lan" "3:lan" "5:lan" "0u@eth1" "4:wan"
;;
mobipromo,cm520-79f)
ucidef_add_switch "switch0" \
"0u@eth0" "3:lan:2" "4:lan:1"
Expand Down Expand Up @@ -157,9 +151,7 @@ ipq40xx_setup_interfaces()
"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan"
;;
zte,mf286d)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0u@eth0" "2:lan:4" "3:lan:3" "4:lan:2" "0u@eth1" "5:wan"
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "wan"
;;
zte,mf289f)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
Expand Down Expand Up @@ -216,7 +208,9 @@ ipq40xx_setup_macs()
ezviz,cs-w3-wd1200g-eup)
label_mac=$(mtd_get_mac_binary "ART" 0x6)
;;
linksys,ea6350v3)
linksys,ea6350v3|\
linksys,ea8300 |\
linksys,mr8300)
wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
lan_mac=$(macaddr_add "$wan_mac" 1)
;;
Expand Down
18 changes: 18 additions & 0 deletions target/linux/ipq40xx/base-files/etc/board.d/05_compat-version
View file
@@ -0,0 +1,18 @@
#
# Copyright (C) 2022 OpenWrt.org
#

. /lib/functions.sh
. /lib/functions/uci-defaults.sh

board_config_update

case "$(board_name)" in
*)
ucidef_set_compat_version "1.1"
;;
esac

board_config_flush

exit 0
4 changes: 2 additions & 2 deletions target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
View file
Expand Up @@ -21,8 +21,8 @@ preinit_set_mac_address() {
linksys,ea8300|\
linksys,mr8300)
base_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
ip link set dev eth0 address "$base_mac"
ip link set dev eth1 address $(macaddr_add "$base_mac" 1)
ip link set dev lan1 address $(macaddr_add "$base_mac" 1)
ip link set dev eth0 address $(macaddr_setbit "$base_mac" 7)
;;
meraki,mr33|\
meraki,mr74)
Expand Down
24 changes: 0 additions & 24 deletions target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh
View file

This file was deleted.

19 changes: 19 additions & 0 deletions target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts
View file
Expand Up @@ -14,6 +14,7 @@
led-failsafe = &status;
led-running = &status;
led-upgrade = &status;
ethernet1 = &swport5;
};

keys {
Expand Down Expand Up @@ -320,6 +321,24 @@
status = "okay";
};

&gmac {
status = "okay";
};

&switch {
status = "okay";
};

&swport4 {
status = "okay";

label = "lan";
};

&swport5 {
status = "okay";
};

&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
Expand Down
18 changes: 18 additions & 0 deletions target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
View file
Expand Up @@ -222,6 +222,24 @@
#gpio-cells = <2>;
};

&gmac {
status = "okay";
};

&switch {
status = "okay";
};

&swport4 {
status = "okay";

label = "lan";
};

&swport5 {
status = "okay";
};

&wifi0 {
status = "okay";

Expand Down
28 changes: 28 additions & 0 deletions target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts
View file
Expand Up @@ -102,6 +102,34 @@
status = "okay";
};

&gmac {
status = "okay";
};

&switch {
status = "okay";
};

&swport1 {
status = "okay";
};

&swport2 {
status = "okay";
};

&swport3 {
status = "okay";
};

&swport4 {
status = "okay";
};

&swport5 {
status = "okay";
};

&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
Expand Down
20 changes: 20 additions & 0 deletions target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts
View file
Expand Up @@ -14,6 +14,8 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
ethernet0 = &swport5;
ethernet1 = &gmac;
};

chosen {
Expand Down Expand Up @@ -287,6 +289,24 @@
pinctrl-names = "default";
};

&gmac {
status = "okay";
};

&switch {
status = "okay";
};

&swport4 {
status = "okay";

label = "lan";
};

&swport5 {
status = "okay";
};

&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
Expand Down

1 comment on commit 550253b

@fda77
Copy link

@fda77 fda77 commented on 550253b Oct 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robimarko: avm-1200 works for me with dsa.
The only noticed quirk: When i change anything eg disable-ipv6 in Network > Interfaces > Devices > "eth0" > Configure
the devices does not respond by IP anymore. After a power toggle some minutes later it reverted the change by itself

Please sign in to comment.