From fc69532eb96a17079f973c0a8735e26234a1f5a1 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Mon, 24 Oct 2022 18:55:44 +0200 Subject: [PATCH] ipq40xx: Convert plasmacloud,pa2200 to DSA MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * ethernet1: - physical port label "Ethernet 1" - its mac address is printed on the device label * ethernet2: - physical port label "Ethernet 2" - can be used to power the device Both ports are not marked by there role (because the vendor firmware automatically detects roles) but the "Ethernet 2" port was used in the past for "WAN" functionality in OpenWrt. Tested-by: Michaël BILCOT Signed-off-by: Sven Eckelmann --- .../ipq40xx/base-files/etc/board.d/02_network | 3 +- .../arch/arm/boot/dts/qcom-ipq4019-pa2200.dts | 33 ++++++++++++++++--- target/linux/ipq40xx/image/generic.mk | 3 +- 3 files changed, 32 insertions(+), 7 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 dc111044e8..24b59d6630 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -77,7 +77,8 @@ ipq40xx_setup_interfaces() openmesh,a62) ucidef_set_interfaces_lan_wan "ethernet2" "ethernet1" ;; - plasmacloud,pa1200) + plasmacloud,pa1200|\ + plasmacloud,pa2200) ucidef_set_interfaces_lan_wan "ethernet1" "ethernet2" ;; zte,mf286d) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts index d7dcf053be..259ea7bb47 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts @@ -17,10 +17,6 @@ status = "okay"; }; - mdio@90000 { - status = "okay"; - }; - tcsr@1949000 { compatible = "qcom,tcsr"; reg = <0x1949000 0x100>; @@ -63,6 +59,7 @@ led-failsafe = &led_status_blue; led-running = &led_power_orange; led-upgrade = &led_status_blue; + label-mac-device = &swport4; }; leds { @@ -207,6 +204,34 @@ }; }; +&mdio { + status = "okay"; +}; + +&gmac { + status = "okay"; +}; + +&switch { + status = "okay"; +}; + +&swport4 { + status = "okay"; + label = "ethernet1"; + + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac0>; +}; + +&swport5 { + status = "okay"; + label = "ethernet2"; + + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac1>; +}; + &wifi0 { status = "okay"; qcom,ath10k-calibration-variant = "PlasmaCloud-PA2200"; diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 8b2851f83e..d05e2c72ec 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -974,8 +974,7 @@ define Device/plasmacloud_pa2200 IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata DEVICE_PACKAGES := ath10k-firmware-qca9888-ct endef -# Missing DSA Setup -#TARGET_DEVICES += plasmacloud_pa2200 +TARGET_DEVICES += plasmacloud_pa2200 define Device/qcom_ap-dk01.1-c1 DEVICE_VENDOR := Qualcomm Atheros -- 2.30.2