aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-05-08 07:22:38 +0200
committerMathias Kresin <dev@kresin.me>2018-05-17 07:40:19 +0200
commit0ff5785c5d5e57d99acb8da06d2c08903448b663 (patch)
tree4541e482fb5751cbedcaf1e94fd9dae380432cdc /target
parent8f7e28a7835521e8e0e6f9ff44005c3374e39bf0 (diff)
downloadupstream-0ff5785c5d5e57d99acb8da06d2c08903448b663.tar.gz
upstream-0ff5785c5d5e57d99acb8da06d2c08903448b663.tar.bz2
upstream-0ff5785c5d5e57d99acb8da06d2c08903448b663.zip
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 <dev@kresin.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt-xm.dts13
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts (renamed from target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts)4
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_nano-m.dts (renamed from target/linux/ath79/dts/ar7241_ubnt-nano-m.dts)4
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts (renamed from target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts)4
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_unifi.dts (renamed from target/linux/ath79/dts/ar7241_ubnt-unifi.dts)0
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_xm.dtsi (renamed from target/linux/ath79/dts/ar7241_ubnt-xm.dtsi)0
-rw-r--r--target/linux/ath79/dts/ar9330_glinet_ar150.dts (renamed from target/linux/ath79/dts/ar9330_gl_ar150.dts)2
-rw-r--r--target/linux/ath79/dts/ar9331_dpt_module.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_dragino_ms14.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts (renamed from target/linux/ath79/dts/ar9331_ew_dorin.dts)2
-rw-r--r--target/linux/ath79/dts/ar9331_omega.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_tl_mr3020.dts2
-rw-r--r--target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts (renamed from target/linux/ath79/dts/qca9558_om5p_ac.dts)0
-rw-r--r--target/linux/ath79/image/generic-ubnt.mk16
-rw-r--r--target/linux/ath79/image/generic.mk14
15 files changed, 27 insertions, 40 deletions
diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dts b/target/linux/ath79/dts/ar7241_ubnt-xm.dts
deleted file mode 100644
index efb01f7b51..0000000000
--- a/target/linux/ath79/dts/ar7241_ubnt-xm.dts
+++ /dev/null
@@ -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";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
index 067c612516..0de97ea933 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts
+++ b/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";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
index 8fbd7a6eec..417e503127 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts
+++ b/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";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
index e1ef6d7095..36fa2750a7 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts
+++ b/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";
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 1cb45e6afc..1cb45e6afc 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index bea9adc5d4..bea9adc5d4 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
diff --git a/target/linux/ath79/dts/ar9330_gl_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
index 97beab1490..16d86137cb 100644
--- a/target/linux/ath79/dts/ar9330_gl_ar150.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/ar9331_dpt_module.dts b/target/linux/ath79/dts/ar9331_dpt_module.dts
index bcd863605b..dc4df6b276 100644
--- a/target/linux/ath79/dts/ar9331_dpt_module.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/ar9331_dragino_ms14.dts b/target/linux/ath79/dts/ar9331_dragino_ms14.dts
index e7c446aa71..9fb674eb2f 100644
--- a/target/linux/ath79/dts/ar9331_dragino_ms14.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/ar9331_ew_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index fd18593807..4b204b7561 100644
--- a/target/linux/ath79/dts/ar9331_ew_dorin.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/ar9331_omega.dts b/target/linux/ath79/dts/ar9331_omega.dts
index 1225b245fd..32551427ea 100644
--- a/target/linux/ath79/dts/ar9331_omega.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/ar9331_tl_mr3020.dts b/target/linux/ath79/dts/ar9331_tl_mr3020.dts
index 7439768a2b..34ee805b33 100644
--- a/target/linux/ath79/dts/ar9331_tl_mr3020.dts
+++ b/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;
diff --git a/target/linux/ath79/dts/qca9558_om5p_ac.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 974b1c61f0..974b1c61f0 100644
--- a/target/linux/ath79/dts/qca9558_om5p_ac.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk
index 17c89fcb1c..b614152263 100644
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/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
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index dab98b7225..d6983605cc 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/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