From 50e1f3d84db6fce48dd094f31cb55197db4c0d55 Mon Sep 17 00:00:00 2001 From: Jan-Niklas Burfeind Date: Mon, 11 Jul 2022 22:42:59 +0200 Subject: [PATCH] ath79: rename references of UniFi to UniFi AP extract the compatible and model to make room for other variants follow-up of commit dc23df8a8ca7 ("ath79: change Ubiquiti UniFi AP model name to include "AP"") Signed-off-by: Jan-Niklas Burfeind --- target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dts | 8 ++++++++ .../{ar7241_ubnt_unifi.dts => ar7241_ubnt_unifi-ap.dtsi} | 3 --- target/linux/ath79/image/generic-ubnt.mk | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dts rename target/linux/ath79/dts/{ar7241_ubnt_unifi.dts => ar7241_ubnt_unifi-ap.dtsi} (95%) diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dts new file mode 100644 index 0000000000..e9f57c0bbe --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ar7241_ubnt_unifi-ap.dtsi" + +/ { + compatible = "ubnt,unifi", "qca,ar7241"; + model = "Ubiquiti UniFi AP"; +}; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi similarity index 95% rename from target/linux/ath79/dts/ar7241_ubnt_unifi.dts rename to target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi index 3c50e89d01..c70a1c02db 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi @@ -3,9 +3,6 @@ #include "ar7241_ubnt_unifi.dtsi" / { - compatible = "ubnt,unifi", "qca,ar7241"; - model = "Ubiquiti UniFi AP"; - aliases { led-boot = &led_dome_green; led-failsafe = &led_dome_green; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 69f7a94863..e6a6de48f0 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -210,12 +210,12 @@ define Device/ubnt_routerstation-pro endef TARGET_DEVICES += ubnt_routerstation-pro -define Device/ubnt_unifi +define Device/ubnt_unifi-ap $(Device/ubnt-bz) DEVICE_MODEL := UniFi AP - SUPPORTED_DEVICES += unifi + SUPPORTED_DEVICES += unifi ubnt,unifi endef -TARGET_DEVICES += ubnt_unifi +TARGET_DEVICES += ubnt_unifi-ap define Device/ubnt_unifiac DEVICE_VENDOR := Ubiquiti