From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Mon, 11 Jul 2022 20:42:59 +0000 (+0200)
Subject: ath79: rename references of UniFi to UniFi AP
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=50e1f3d84db6fce48dd094f31cb55197db4c0d55;p=openwrt%2Fstaging%2Faparcar.git

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
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-ap.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
new file mode 100644
index 0000000000..c70a1c02db
--- /dev/null
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar7241_ubnt_unifi.dtsi"
+
+/ {
+	aliases {
+		led-boot = &led_dome_green;
+		led-failsafe = &led_dome_green;
+		led-running = &led_dome_green;
+		led-upgrade = &led_dome_green;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_dome_green: dome_green {
+			label = "green:dome";
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+		};
+
+		dome_orange {
+			label = "orange:dome";
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&spi {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x000000 0x040000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "u-boot-env";
+				reg = <0x040000 0x010000>;
+				read-only;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x050000 0x750000>;
+			};
+
+			partition@7a0000 {
+				label = "board_config";
+				reg = <0x7a0000 0x010000>;
+				read-only;
+			};
+
+			partition@7b0000 {
+				label = "cfg";
+				reg = <0x7b0000 0x040000>;
+				read-only;
+			};
+
+			art: partition@7f0000 {
+				label = "art";
+				reg = <0x7f0000 0x010000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&eth0 {
+	nvmem-cells = <&macaddr_art_0>;
+	nvmem-cell-names = "mac-address";
+};
+
+&eth1 {
+	compatible = "syscon", "simple-mfd";
+};
+
+&art {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_art_0: macaddr@0 {
+		reg = <0x0 0x6>;
+	};
+};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
deleted file mode 100644
index 3c50e89d01..0000000000
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#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;
-		led-running = &led_dome_green;
-		led-upgrade = &led_dome_green;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_dome_green: dome_green {
-			label = "green:dome";
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-		};
-
-		dome_orange {
-			label = "orange:dome";
-			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&spi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <25000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "u-boot";
-				reg = <0x000000 0x040000>;
-				read-only;
-			};
-
-			partition@40000 {
-				label = "u-boot-env";
-				reg = <0x040000 0x010000>;
-				read-only;
-			};
-
-			partition@50000 {
-				compatible = "denx,uimage";
-				label = "firmware";
-				reg = <0x050000 0x750000>;
-			};
-
-			partition@7a0000 {
-				label = "board_config";
-				reg = <0x7a0000 0x010000>;
-				read-only;
-			};
-
-			partition@7b0000 {
-				label = "cfg";
-				reg = <0x7b0000 0x040000>;
-				read-only;
-			};
-
-			art: partition@7f0000 {
-				label = "art";
-				reg = <0x7f0000 0x010000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&eth0 {
-	nvmem-cells = <&macaddr_art_0>;
-	nvmem-cell-names = "mac-address";
-};
-
-&eth1 {
-	compatible = "syscon", "simple-mfd";
-};
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};
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