From f00966531d3febea3f75a477fbee041e53de4965 Mon Sep 17 00:00:00 2001 From: Tim Wilkinson Date: Mon, 15 May 2023 14:10:05 -0700 Subject: [PATCH] PowerBaam 5ac-620 support (#840) --- SUPPORTED_DEVICES.md | 1 + configs/ath79-generic.config | 1 + files/etc/radios.json | 5 +++ patches/749-ubiquiti-extra-support.patch | 43 +++++++++++++++++++++--- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/SUPPORTED_DEVICES.md b/SUPPORTED_DEVICES.md index 99bfc9d0..8b422510 100644 --- a/SUPPORTED_DEVICES.md +++ b/SUPPORTED_DEVICES.md @@ -70,6 +70,7 @@ PicoStation M2 || 2 | ath79 | tiny (2) | ubnt_picostation-m | 32MB | unknown | s PowerBeam AC 5 Gen2 || 5 | ath79 | generic | ubnt_powerbeam-5ac-gen2 | 128MB | unknown | released PowerBeam AC 5 400 || 5 | ath79 | generic | ubnt_powerbeam-5ac-400 | 128MB | unknown | nightly PowerBeam AC 5 500 | PBE-5AC-500
PBE-5AC-500-US | 5 | ath79 | generic | ubnt_powerbeam-5ac-500 | 128MB | stable | released +PowerBeam AC 5 620 || 5 | ath79 | generic | ubnt_powerbeam-5ac-620 | 128MB | unknown | nightly PowerBeam-M2-400 || 2 | ath79 | generic | ubnt_powerbeam-m2-xw | 64MB | stable | released PowerBeam-M5-300 || 5 | ath79 | generic | ubnt_powerbeam-m5-300 | 64MB | stable | released PowerBeam-M5-400 || 5 | ath79 | generic | ubnt_powerbeam-m5-xw | 64MB | stable | released diff --git a/configs/ath79-generic.config b/configs/ath79-generic.config index 65a6c456..a85c2493 100644 --- a/configs/ath79-generic.config +++ b/configs/ath79-generic.config @@ -40,6 +40,7 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-m2-xw=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-m5-xw=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-5ac-400=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-5ac-500=y +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-5ac-620=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbeam-5ac-gen2=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_powerbridge-m=y CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_rocket-5ac-lite=y diff --git a/files/etc/radios.json b/files/etc/radios.json index 4003cd9d..193e8888 100644 --- a/files/etc/radios.json +++ b/files/etc/radios.json @@ -451,6 +451,11 @@ "maxpower" : "22", "pwroffset" : "4" }, + "0xe5f5": { + "name" : "Ubiquiti PowerBeam 5AC 620", + "maxpower" : "23", + "pwroffset" : "1" + }, "0xe6e5" : { "name" : "Ubiquiti PowerBeam M5 400-ISO", "maxpower" : "22", diff --git a/patches/749-ubiquiti-extra-support.patch b/patches/749-ubiquiti-extra-support.patch index c70609c5..55790473 100755 --- a/patches/749-ubiquiti-extra-support.patch +++ b/patches/749-ubiquiti-extra-support.patch @@ -93,17 +93,26 @@ ubnt,powerbeam-5ac-500|\ --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk -@@ -165,6 +165,14 @@ +@@ -165,6 +165,23 @@ endef TARGET_DEVICES += ubnt_powerbeam-5ac-gen2 +define Device/ubnt_powerbeam-5ac-400 + $(Device/ubnt-wa) -+ DEVICE_MODEL := PowerBeam 5AC 400 ++ DEVICE_MODEL := PowerBeam 5AC + DEVICE_VARIANT := 400 + DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct rssileds +endef +TARGET_DEVICES += ubnt_powerbeam-5ac-400 ++ ++define Device/ubnt_powerbeam-5ac-620 ++ $(Device/ubnt-xc) ++ SOC := qca9558 ++ DEVICE_MODEL := PowerBeam 5AC ++ DEVICE_VARIANT := 620 ++ DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct ++endef ++TARGET_DEVICES += ubnt_powerbeam-5ac-620 + define Device/ubnt_powerbeam-m2-xw $(Device/ubnt-xw) @@ -149,23 +158,36 @@ + }; + }; +}; +--- /dev/null ++++ b/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-620.dts +@@ -0,0 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-only ++ ++#include "qca9558_ubnt_powerbeam-5ac-500.dts" ++ ++/ { ++ compatible = "ubnt,powerbeam-5ac-620", "ubnt,xc", "qca,qca9558"; ++ model = "Ubiquiti PowerBeam 5AC 620"; ++}; --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network -@@ -101,6 +101,7 @@ +@@ -101,6 +101,8 @@ ubnt,nanostation-ac-loco|\ ubnt,nanostation-loco-m-xw|\ ubnt,powerbeam-5ac-500|\ + ubnt,powerbeam-5ac-400|\ ++ ubnt,powerbeam-5ac-620|\ ubnt,powerbeam-5ac-gen2|\ ubnt,powerbeam-m2-xw|\ ubnt,powerbeam-m5-xw|\ --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -47,6 +47,7 @@ +@@ -47,6 +47,8 @@ ubnt,nanobeam-ac-xc|\ ubnt,nanostation-ac|\ ubnt,nanostation-ac-loco|\ + ubnt,powerbeam-5ac-400|\ ++ ubnt,powerbeam-5ac-620|\ ubnt,powerbeam-5ac-500|\ ubnt,powerbeam-5ac-gen2|\ ubnt,rocket-5ac-lite|\ @@ -311,11 +333,12 @@ ubnt,nanobeam-m5-1[69]|\ ubnt,nanostation-ac-loco|\ ubnt,nanostation-loco-m-xw|\ -@@ -762,6 +763,7 @@ +@@ -762,6 +763,8 @@ ubnt,litebeam-ac-gen2|\ ubnt,nanobeam-ac-gen2|\ ubnt,nanobeam-ac-xc|\ + ubnt,nanobeam-ac-gen2-xc|\ ++ ubnt,powerbeam-5ac-620|\ ubnt,powerbeam-5ac-500|\ ubnt,powerbeam-5ac-gen2) label_mac=$(mtd_get_mac_binary art 0x5006) @@ -329,3 +352,13 @@ ubnt,nanobeam-ac-xc|\ ubnt,nanostation-ac|\ ubnt,nanostation-ac-loco|\ +--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata ++++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +@@ -49,6 +49,7 @@ + ubnt,nanostation-ac-loco|\ + ubnt,powerbeam-5ac-400|\ + ubnt,powerbeam-5ac-500|\ ++ ubnt,powerbeam-5ac-620|\ + ubnt,powerbeam-5ac-gen2|\ + ubnt,rocket-5ac-lite|\ + ubnt,unifiac-pro|\