From 3195a992d6f635ad82dbe39ee584571371334450 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 21 Dec 2022 10:34:03 +0100 Subject: [PATCH] ipq40xx: convert Aruba AP-303H to DSA and enable target again The target was disabled since noone did the DSA conversion. Add the conversion and enable it again. Tested-by: John Walshaw Signed-off-by: Bjoern Dobe Signed-off-by: Nick Hainke --- .../ipq40xx/base-files/etc/board.d/02_network | 1 + .../arm/boot/dts/qcom-ipq4029-ap-303h.dts | 32 +++++++++++++++++++ target/linux/ipq40xx/image/generic.mk | 3 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 74f39ef6de..bceb434bff 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -69,6 +69,7 @@ ipq40xx_setup_interfaces() mikrotik,wap-r-ac) ucidef_set_interface_lan "sw-eth1 sw-eth2" ;; + aruba,ap-303h|\ netgear,rbr50|\ netgear,rbs50|\ netgear,srr60|\ diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index 7978f90eb4..fba6209d99 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -420,6 +420,38 @@ status = "okay"; }; +&gmac { + status = "okay"; +}; + +&switch { + status = "okay"; +}; + +&swport2 { + status = "okay"; + + label = "lan1"; +}; + +&swport3 { + status = "okay"; + + label = "lan2"; +}; + +&swport4 { + status = "okay"; + + label = "lan3"; +}; + +&swport5 { + status = "okay"; + + label = "wan"; +}; + &wifi0 { status = "okay"; qcom,ath10k-calibration-variant = "Aruba-AP-303"; diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 290581ac80..5dae52ff0e 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -181,8 +181,7 @@ define Device/aruba_ap-303h $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-303H endef -# Missing DSA Setup -#TARGET_DEVICES += aruba_ap-303h +TARGET_DEVICES += aruba_ap-303h define Device/aruba_ap-365 $(call Device/aruba_glenmorangie) -- 2.30.2