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 <git@aiyionpri.me>

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 (file)
index 0000000..e9f57c0
--- /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 3c50e89d0175ef7445a5e2855d0a394b21fac221..c70a1c02dba9d2a1e37ff7c17ae9941022621b84 100644 (file)
--- 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 69f7a948631609761fa7e74058dd183995a57cc2..e6a6de48f0567659580fe49b7306132db639cc66 100644 (file)
--- 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