ath79: fix dts files

Add the SoC compatible to the individual dts files. Rename the dts files
to match the common pattern.

Remove dts files wich aren't used and no image in ar71xx exists.

Signed-off-by: Mathias Kresin <[email protected]>

target/linux/ath79/dts/ar7241_ubnt-xm.dts

@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar7241_ubnt-xm.dtsi"
-
-/ {
-	compatible = "ubnt,xm", "qca,ar7241";
-	model = "Ubiquiti Networks XM (rev 1.0) board";
-};
-
-&eth1 {
-	compatible = "syscon";
-};

target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts → target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt-xm.dtsi"
+#include "ar7241_ubnt_xm.dtsi"
 
 / {
-	compatible = "ubnt,xm", "qca,ar7241";
+	compatible = "ubnt,bullet-m", "qca,ar7241";
 	model = "Ubiquiti Bullet M";
 };
 

target/linux/ath79/dts/ar7241_ubnt-nano-m.dts → target/linux/ath79/dts/ar7241_ubnt_nano-m.dts

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt-xm.dtsi"
+#include "ar7241_ubnt_xm.dtsi"
 
 / {
-	compatible = "ubnt,nm", "qca,ar7241";
+	compatible = "ubnt,nano-m", "qca,ar7241";
 	model = "Ubiquiti Nanostation M";
 };

target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts → target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ar7241_ubnt-xm.dtsi"
+#include "ar7241_ubnt_xm.dtsi"
 
 / {
-	compatible = "ubnt,rm", "qca,ar7241";
+	compatible = "ubnt,rocket-m", "qca,ar7241";
 	model = "Ubiquiti Rocket M";
 };
 

target/linux/ath79/dts/ar9330_gl_ar150.dts → target/linux/ath79/dts/ar9330_glinet_ar150.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "GL.iNet GL-AR150";
-	compatible = "glinet,ar150";
+	compatible = "glinet,ar150", "qca,ar9330";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/dts/ar9331_dpt_module.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "DPTechnics DPT-Module";
-	compatible = "dptechnics,dpt-module";
+	compatible = "dptechnics,dpt-module", "qca,ar9331";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/dts/ar9331_dragino_ms14.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "Dragino MS14 (Dragino 2)";
-	compatible = "dragino,ms14";
+	compatible = "dragino,ms14", "qca,ar9331";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/dts/ar9331_ew_dorin.dts → target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "Embedded Wireless Dorin";
-	compatible = "embeddedwireless,dorin";
+	compatible = "embeddedwireless,dorin", "qca,ar9331";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/dts/ar9331_omega.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "Onion Omega";
-	compatible = "onion,omega";
+	compatible = "onion,omega", "qca,ar9331";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/dts/ar9331_tl_mr3020.dts

@@ -8,7 +8,7 @@
 
 / {
 	model = "TP-Link TL-MR3020";
-	compatible = "tplink,tl-mr3020";
+	compatible = "tplink,tl-mr3020", "qca,ar9331";
 
 	aliases {
 		serial0 = &uart;

target/linux/ath79/image/generic-ubnt.mk

@@ -81,35 +81,35 @@ define Device/ubnt-airrouter
 endef
 #TARGET_DEVICES += ubnt-airrouter
 
-define Device/ubnt-bullet-m
+define Device/ubnt_bullet-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Bullet-M
   BOARDNAME := UBNT-BM
 endef
-TARGET_DEVICES += ubnt-bullet-m
+TARGET_DEVICES += ubnt_bullet-m
 
-define Device/ubnt-rocket-m
+define Device/ubnt_rocket-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Rocket-M
   BOARDNAME := UBNT-RM
 endef
-TARGET_DEVICES += ubnt-rocket-m
+TARGET_DEVICES += ubnt_rocket-m
 
-define Device/ubnt-nano-m
+define Device/ubnt_nano-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Nano-M
   BOARDNAME := UBNT-NM
 endef
-TARGET_DEVICES += ubnt-nano-m
+TARGET_DEVICES += ubnt_nano-m
 
-define Device/ubnt-unifi
+define Device/ubnt_unifi
   $(Device/ubnt-bz)
   ATH_SOC := ar7241
   DEVICE_TITLE := Ubiquiti UniFi
   BOARDNAME := UBNT-UF
   DEVICE_PROFILE += UBNTUNIFI
 endef
-TARGET_DEVICES += ubnt-unifi
+TARGET_DEVICES += ubnt_unifi
 
 define Device/ubnt-unifiac
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2

target/linux/ath79/image/generic.mk

@@ -21,30 +21,30 @@ define Build/netgear-uImage
 	$(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
 endef
 
-define Device/ew_dorin
+define Device/embeddedwireless_dorin
   ATH_SOC := ar9331
   DEVICE_TITLE := Embedded Wireless Dorin
   DEVICE_PACKAGES := kmod-usb-chipidea2
 endef
 
-TARGET_DEVICES += ew_dorin
+TARGET_DEVICES += embeddedwireless_dorin
 
-define Device/gl_ar150
+define Device/glinet_ar150
   ATH_SOC := ar9330
   DEVICE_TITLE := GL.iNet GL-AR150
   DEVICE_PACKAGES := kmod-usb-chipidea2
   IMAGE_SIZE := 16000k
 endef
-TARGET_DEVICES += gl_ar150
+TARGET_DEVICES += glinet_ar150
 
-define Device/om5p_ac
+define Device/openmesh_om5p-ac-v2
   ATH_SOC := qca9558
-  DEVICE_TITLE := OpenMesh OM5P-AC
+  DEVICE_TITLE := OpenMesh OM5P-AC v2
   DEVICE_PROFILE := OM5P-AC
   DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x om-watchdog
 endef
 
-TARGET_DEVICES += om5p_ac
+TARGET_DEVICES += openmesh_om5p-ac-v2
 
 define Device/netgear_wndr3700
   ATH_SOC:=ar7100