90 files changed, 98 insertions, 99 deletions
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi
index 496150b7a7..496150b7a7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index c5dd1600f4..c5dd1600f4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
index 943b00f898..943b00f898 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
index 344c2f4fa8..344c2f4fa8 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index aa825abd9f..aa825abd9f 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index 424b778bb4..424b778bb4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 044ae2b417..044ae2b417 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 5419215dc6..5419215dc6 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts
index 87ba62de33..87ba62de33 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_lantiq_easy50810.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts
index 98a2ebd98e..cbc99fe620 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "DGN3500.dtsi"
+#include "ar9_netgear_dgn3500.dtsi"
 
 / {
 	compatible = "netgear,dgn3500", "lantiq,xway", "lantiq,ar9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index a3dbbbdfad..a3dbbbdfad 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts
index d1d788cc7d..b69613e48f 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "DGN3500.dtsi"
+#include "ar9_netgear_dgn3500.dtsi"
 
 / {
 	compatible = "netgear,dgn3500b", "lantiq,xway", "lantiq,ar9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index 9b640e0327..9b640e0327 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 79896c6478..79896c6478 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
index 6ee6dda571..6ee6dda571 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
index 19a44d5f6d..19a44d5f6d 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts
index 34f868f484..ff34068005 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ARV4518PWR01.dtsi"
+#include "danube_arcadyan_arv4518pwr01.dtsi"
 
 / {
 	compatible = "arcadyan,arv4518pwr01", "lantiq,xway", "lantiq,danube";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
index dcae06d894..dcae06d894 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts
index 9617398bbc..b261a2fa91 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ARV4518PWR01.dtsi"
+#include "danube_arcadyan_arv4518pwr01.dtsi"
 
 / {
 	compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 8e5301ddc9..8e5301ddc9 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index b59477cb19..b59477cb19 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index cceb42164e..cceb42164e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index eecff4bb0b..eecff4bb0b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 9e4216033b..9e4216033b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index e5fd05fe40..e5fd05fe40 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index ae0d27a042..ae0d27a042 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 34b541af92..34b541af92 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index d673c9b204..d673c9b204 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 069b1b1ed6..069b1b1ed6 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index ec90a2bef9..ec90a2bef9 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index 4bf44a10e1..4bf44a10e1 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
index 67b0f9631f..67b0f9631f 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 40886feec4..40886feec4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
index 1afc74900e..1afc74900e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
index 0072f7e2b1..0072f7e2b1 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon.dtsi
index dada3bcff2..dada3bcff2 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
index 12c448c2e6..22ce8caced 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
@@ -2,7 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon FTTDP8 Reference Board";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
index 3f29d319cd..fa331450bf 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
@@ -2,7 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon FTTdp G.FAST Reference Board";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
index 2155f0cb1d..e4719d59e0 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "EASY98000-base.dtsi"
+#include "falcon_lantiq_easy98000.dtsi"
 
 / {
 	model = "Lantiq Falcon (NAND)";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
index 3cb00343f5..cba277e6d1 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "EASY98000-base.dtsi"
+#include "falcon_lantiq_easy98000.dtsi"
 
 / {
 	model = "Lantiq Falcon (NOR)";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts
index bbe524e94e..e8d8b42470 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts
@@ -1,8 +1,8 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "EASY98000-base.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_lantiq_easy98000.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon (SFLASH)";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
index fa8c0b4b06..fa8c0b4b06 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
index 571e23454a..773a490019 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon Reference Board V1.8";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
index 7a3ef418d0..397764aac4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon Reference Board";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
index 7eb40bde24..aa63268149 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon HGU Reference Board";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts
index df941cdb67..f1ecebec3b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon SFP Stick with SyncE";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts
index a3abc6e707..98421174d3 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon SFP Stick with SyncE/1588";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
index c5da8b564f..130d49ebd7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon / Vinax MDU Board";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts
index 8d45de4ebe..880c4edca8 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 #include "falcon.dtsi"
-#include "falcon-sflash-16M.dtsi"
+#include "falcon_sflash-16m.dtsi"
 
 / {
 	model = "Lantiq Falcon SFP Stick";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
index b35f70b646..b35f70b646 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
index 9e27830cb1..9e27830cb1 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index 3d10f582b0..3d10f582b0 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index d6c521cfe7..d6c521cfe7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index e074147d66..e074147d66 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts
index 5a33121d72..9f6f405a09 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VGV7510KW22.dtsi"
+#include "vr9_arcadyan_vgv7510kw22.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7510kw22-brn", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
index 2accffaed7..613ff3782c 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VGV7510KW22.dtsi"
+#include "vr9_arcadyan_vgv7510kw22.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7510kw22-nor", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 8db1ffbf81..8db1ffbf81 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts
index c51a44bb3d..051de0c23e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VGV7519.dtsi"
+#include "vr9_arcadyan_vgv7519.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7519-brn", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
index aa6a96156f..2121fbf41d 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VGV7519.dtsi"
+#include "vr9_arcadyan_vgv7519.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7519-nor", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index e82407d7c3..e82407d7c3 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts
index 15bd0d2713..1aea98260a 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "FRITZ3370-REV2.dtsi"
+#include "vr9_avm_fritz3370-rev2.dtsi"
 
 / {
 	compatible = "avm,fritz3370-rev2-hynix", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts
index 7e4a3e1114..a19d168159 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "FRITZ3370-REV2.dtsi"
+#include "vr9_avm_fritz3370-rev2.dtsi"
 
 / {
 	compatible = "avm,fritz3370-rev2-micron", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
index bac27c3649..bac27c3649 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 0fbe6396a8..012300ec57 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "FRITZ736X.dtsi"
+#include "vr9_avm_fritz736x.dtsi"
 
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index feb9242574..a061a482da 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "FRITZ736X.dtsi"
+#include "vr9_avm_fritz736x.dtsi"
 
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
index 1553d2f7f4..1553d2f7f4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
index 43216d66be..43216d66be 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index f6a2d9f6a7..f6a2d9f6a7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 4631ad4ffe..4631ad4ffe 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
index 0bf8e1b7ef..585521459b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 
-#include "EASY80920.dtsi"
+#include "vr9_lantiq_easy80920.dtsi"
 
 / {
 	compatible = "lantiq,easy80920-nand", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
index 6ed6c5d427..c204c5e093 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "EASY80920.dtsi"
+#include "vr9_lantiq_easy80920.dtsi"
 
 / {
 	compatible = "lantiq,easy80920-nor", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 4fbc1ac496..4fbc1ac496 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index cdba656e49..cdba656e49 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts
index 25eb3dac67..9b3055983a 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TDW89X0.dtsi"
+#include "vr9_tplink_tdw89x0.dtsi"
 
 / {
 	compatible = "tplink,tdw8970", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
index 76875e735d..725aa759d2 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TDW89X0.dtsi"
+#include "vr9_tplink_tdw89x0.dtsi"
 
 / {
 	compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index eabbc0257f..eabbc0257f 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
index 8724e37b47..98f2282579 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VR200.dtsi"
+#include "vr9_tplink_vr200.dtsi"
 
 / {
 	compatible = "tplink,vr200", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index 93178da7e2..93178da7e2 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
index 34805bb9f0..2e25a72a83 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VR200.dtsi"
+#include "vr9_tplink_vr200.dtsi"
 
 / {
 	compatible = "tplink,vr200v", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index d1a04a4a78..4d7aac325b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "P2812HNUFX.dtsi"
+#include "vr9_zyxel_p-2812hnu-fx.dtsi"
 
 / {
 	compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
index a607311460..7da1533809 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "P2812HNUFX.dtsi"
+#include "vr9_zyxel_p-2812hnu-fx.dtsi"
 
 / {
 	compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index 5f8392ca44..5f8392ca44 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index a2052ef924..3060ff920b 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -61,6 +61,8 @@ define Device/Default
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
   FILESYSTEMS := squashfs
   IMAGE_SIZE :=
+  DTS_DIR := $(DTS_DIR)/lantiq
+  DEVICE_DTS = $$(SOC)_$(1)
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk
index 77afaa8bed..c9329a4dd9 100644
--- a/target/linux/lantiq/image/amazonse.mk
+++ b/target/linux/lantiq/image/amazonse.mk
@@ -2,7 +2,7 @@ define Device/allnet_all0333cj
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL0333CJ
   IMAGE_SIZE := 3700k
-  DEVICE_DTS := ALL0333CJ
+  SOC := amazonse
   DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
 	kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
 	ltq-adsl-app ppp-mod-pppoe
@@ -13,7 +13,7 @@ define Device/netgear_dgn1000b
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DGN1000B
   IMAGE_SIZE := 6000k
-  DEVICE_DTS := DGN1000B
+  SOC := amazonse
   DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \
 	kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \
 	ltq-adsl-app ppp-mod-pppoe
diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk
index 272227bdb3..f86e2d1c68 100644
--- a/target/linux/lantiq/image/ar9.mk
+++ b/target/linux/lantiq/image/ar9.mk
@@ -1,7 +1,7 @@
 define Device/avm_fritz7312
   $(Device/AVM)
   DEVICE_MODEL := FRITZ!Box 7312
-  DEVICE_DTS := FRITZ7312
+  SOC := ar9
   IMAGE_SIZE := 15744k
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -16,7 +16,7 @@ define Device/avm_fritz7320
   DEVICE_MODEL := FRITZ!Box 7320
   DEVICE_ALT0_VENDOR := 1&1
   DEVICE_ALT0_MODEL := HomeServer
-  DEVICE_DTS := FRITZ7320
+  SOC := ar9
   IMAGE_SIZE := 15744k
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -33,7 +33,7 @@ define Device/bt_homehub-v3a
   DEVICE_MODEL := Home Hub
   DEVICE_VARIANT := Type A
   BOARD_NAME := BTHOMEHUBV3A
-  DEVICE_DTS := BTHOMEHUBV3A
+  SOC := ar9
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
@@ -50,7 +50,8 @@ define Device/buffalo_wbmr-hp-g300h-a
   DEVICE_MODEL := WBMR-HP-G300H
   DEVICE_VARIANT := A
   IMAGE_SIZE := 31488k
-  DEVICE_DTS := WBMR
+  SOC := ar9
+  DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
@@ -65,7 +66,8 @@ define Device/buffalo_wbmr-hp-g300h-b
   DEVICE_MODEL := WBMR-HP-G300H
   DEVICE_VARIANT := B
   IMAGE_SIZE := 31488k
-  DEVICE_DTS := WBMR
+  SOC := ar9
+  DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -80,7 +82,7 @@ DGN3500_KERNEL_OFFSET_DEC=327680
 define Device/netgear_dgn3500
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DGN3500
-  DEVICE_DTS := DGN3500
+  SOC := ar9
   IMAGE_SIZE := 16000k
   IMAGES := \
 	sysupgrade-na.bin sysupgrade.bin \
@@ -112,7 +114,7 @@ TARGET_DEVICES += netgear_dgn3500
 define Device/netgear_dgn3500b
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DGN3500B
-  DEVICE_DTS := DGN3500B
+  SOC := ar9
   IMAGE_SIZE := 16000k
   IMAGES += factory.img
   IMAGE/sysupgrade.bin := \
@@ -136,7 +138,7 @@ define Device/zte_h201l
   DEVICE_VENDOR := ZTE
   DEVICE_MODEL := H201L
   IMAGE_SIZE := 7808k
-  DEVICE_DTS := H201L
+  SOC := ar9
   DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
@@ -152,7 +154,7 @@ define Device/zyxel_p-2601hn
   DEVICE_MODEL := P-2601HN
   DEVICE_VARIANT := F1/F3
   IMAGE_SIZE := 15616k
-  DEVICE_DTS := P2601HNFX
+  SOC := ar9
   DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk
index 8171900a6f..2fb5ea061f 100644
--- a/target/linux/lantiq/image/danube.mk
+++ b/target/linux/lantiq/image/danube.mk
@@ -4,7 +4,7 @@ define Device/arcadyan_arv4510pw
   DEVICE_ALT0_VENDOR := Wippies
   DEVICE_ALT0_MODEL := BeWan iBox v1.0
   IMAGE_SIZE := 15616k
-  DEVICE_DTS := ARV4510PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -23,7 +23,7 @@ define Device/arcadyan_arv4519pw
   DEVICE_ALT1_VENDOR := Pirelli
   DEVICE_ALT1_MODEL := P.RG A4201G
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4519PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -38,7 +38,7 @@ define Device/arcadyan_arv7506pw11
   DEVICE_ALT0_VENDOR := Alice/O2
   DEVICE_ALT0_MODEL := IAD 4421
   IMAGE_SIZE := 7808k
-  DEVICE_DTS := ARV7506PW11
+  SOC := danube
   DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
 	ltq-adsl-app ppp-mod-pppoa \
@@ -53,7 +53,7 @@ define Device/arcadyan_arv7510pw22
   DEVICE_ALT0_VENDOR := Astoria Networks
   DEVICE_ALT0_MODEL := ARV7510PW22
   IMAGE_SIZE := 31232k
-  DEVICE_DTS := ARV7510PW22
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -71,7 +71,7 @@ define Device/arcadyan_arv7518pw
   DEVICE_ALT0_VENDOR := Astoria Networks
   DEVICE_ALT0_MODEL := ARV7518PW
   IMAGE_SIZE := 7872k
-  DEVICE_DTS := ARV7518PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -87,7 +87,7 @@ define Device/arcadyan_arv7519pw
   DEVICE_ALT0_VENDOR := Astoria Networks
   DEVICE_ALT0_MODEL := ARV7519PW
   IMAGE_SIZE := 15488k
-  DEVICE_DTS := ARV7519PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -104,7 +104,7 @@ define Device/arcadyan_arv7525pw
   DEVICE_ALT0_MODEL := Speedport W303V
   DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4510PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -119,7 +119,7 @@ define Device/arcadyan_arv752dpw
   DEVICE_ALT0_VENDOR := Vodafone
   DEVICE_ALT0_MODEL := Easybox 802
   IMAGE_SIZE := 7872k
-  DEVICE_DTS := ARV752DPW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -136,7 +136,7 @@ define Device/arcadyan_arv752dpw22
   DEVICE_ALT0_VENDOR := Vodafone
   DEVICE_ALT0_MODEL := Easybox 803
   IMAGE_SIZE := 7616k
-  DEVICE_DTS := ARV752DPW22
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -153,7 +153,7 @@ define Device/arcadyan_arv8539pw22
   DEVICE_ALT0_VENDOR := Telekom
   DEVICE_ALT0_MODEL := Speedport W504V Typ A
   IMAGE_SIZE := 7616k
-  DEVICE_DTS := ARV8539PW22
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -167,7 +167,7 @@ define Device/audiocodes_mp-252
   DEVICE_VENDOR := AudioCodes
   DEVICE_MODEL := MediaPack MP-252
   IMAGE_SIZE := 14848k
-  DEVICE_DTS := ACMP252
+  SOC := danube
   DEVICE_PACKAGES :=  kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
 	kmod-ltq-tapi kmod-ltq-vmmc \
@@ -185,7 +185,7 @@ define Device/bt_homehub-v2b
   DEVICE_MODEL := Home Hub 2
   DEVICE_VARIANT := Type B
   BOARD_NAME := BTHOMEHUBV2B
-  DEVICE_DTS := BTHOMEHUBV2B
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -199,7 +199,7 @@ TARGET_DEVICES += bt_homehub-v2b
 define Device/lantiq_easy50712
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := Danube (EASY50712)
-  DEVICE_DTS := EASY50712
+  SOC := danube
   IMAGE_SIZE := 3776k
 endef
 TARGET_DEVICES += lantiq_easy50712
@@ -208,7 +208,7 @@ define Device/siemens_gigaset-sx76x
   DEVICE_VENDOR := Siemens
   DEVICE_MODEL := Gigaset sx76x
   IMAGE_SIZE := 7680k
-  DEVICE_DTS := GIGASX76X
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk
index 38ba856cf8..e6aae1240b 100644
--- a/target/linux/lantiq/image/falcon.mk
+++ b/target/linux/lantiq/image/falcon.mk
@@ -2,7 +2,7 @@ define Device/lantiq_easy88388
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY88388
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy88388
 
@@ -10,7 +10,7 @@ define Device/lantiq_easy88444
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY88444
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy88444
 
@@ -19,7 +19,7 @@ define Device/lantiq_easy98020
   DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
   DEVICE_VARIANT := v1.0-v1.7
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98020
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy98020
 
@@ -28,7 +28,7 @@ define Device/lantiq_easy98020-v18
   DEVICE_MODEL := Falcon SFU Reference Board (EASY98020)
   DEVICE_VARIANT := v1.8
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98020V18
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy98020-v18
 
@@ -36,7 +36,7 @@ define Device/lantiq_easy98021
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := Falcon HGU Reference Board (EASY98021)
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98021
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy98021
 
@@ -45,7 +45,7 @@ define Device/lantiq_easy98035synce
   DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE)
   DEVICE_VARIANT := with Synchronous Ethernet
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98035SYNCE
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy98035synce
 
@@ -54,7 +54,7 @@ define Device/lantiq_easy98035synce1588
   DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588)
   DEVICE_VARIANT := with SyncE and IEEE1588
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98035SYNCE1588
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_easy98035synce1588
 
@@ -63,7 +63,7 @@ define Device/lantiq_easy98000-nand
   DEVICE_MODEL := EASY98000 Falcon Eval Board
   DEVICE_VARIANT := NAND
   IMAGE_SIZE := 3904k
-  DEVICE_DTS := EASY98000NAND
+  SOC := falcon
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-nand
@@ -73,7 +73,7 @@ define Device/lantiq_easy98000-nor
   DEVICE_MODEL := EASY98000 Falcon Eval Board
   DEVICE_VARIANT := NOR
   IMAGE_SIZE := 3904k
-  DEVICE_DTS := EASY98000NOR
+  SOC := falcon
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-nor
@@ -83,7 +83,7 @@ define Device/lantiq_easy98000-sflash
   DEVICE_MODEL := EASY98000 Falcon Eval Board
   DEVICE_VARIANT := SFLASH
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := EASY98000SFLASH
+  SOC := falcon
   DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24
 endef
 TARGET_DEVICES += lantiq_easy98000-sflash
@@ -92,7 +92,7 @@ define Device/lantiq_falcon-mdu
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := Falcon / VINAXdp MDU Board
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := FALCON-MDU
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_falcon-mdu
 
@@ -100,6 +100,6 @@ define Device/lantiq_falcon-sfp
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := Falcon SFP Stick
   IMAGE_SIZE := 7424k
-  DEVICE_DTS := FALCON-SFP
+  SOC := falcon
 endef
 TARGET_DEVICES += lantiq_falcon-sfp
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index 3be40fc947..56a7e5ca57 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -2,6 +2,7 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN
 
 define Device/lantiqTpLink
   DEVICE_VENDOR := TP-Link
+  SOC := vr9
   TPLINK_HWREVADD := 0
   TPLINK_HVERSION := 2
   KERNEL := kernel-bin | append-dtb | lzma
@@ -16,7 +17,6 @@ define Device/tplink_tdw8970
   $(Device/lantiqTpLink)
   DEVICE_MODEL := TD-W8970
   DEVICE_VARIANT := v1
-  DEVICE_DTS := TDW8970
   TPLINK_FLASHLAYOUT := 8Mltq
   TPLINK_HWID := 0x89700001
   TPLINK_HWREV := 1
@@ -30,7 +30,6 @@ define Device/tplink_tdw8980
   $(Device/lantiqTpLink)
   DEVICE_MODEL := TD-W8980
   DEVICE_VARIANT := v1
-  DEVICE_DTS := TDW8980
   TPLINK_FLASHLAYOUT := 8Mltq
   TPLINK_HWID := 0x89800001
   TPLINK_HWREV := 14
@@ -44,7 +43,6 @@ define Device/tplink_vr200
   $(Device/lantiqTpLink)
   DEVICE_MODEL := Archer VR200
   DEVICE_VARIANT := v1
-  DEVICE_DTS := VR200
   TPLINK_FLASHLAYOUT := 16Mltq
   TPLINK_HWID := 0x63e64801
   TPLINK_HWREV := 0x53
@@ -58,7 +56,6 @@ define Device/tplink_vr200v
   $(Device/lantiqTpLink)
   DEVICE_MODEL := Archer VR200v
   DEVICE_VARIANT := v1
-  DEVICE_DTS := VR200v
   TPLINK_FLASHLAYOUT := 16Mltq
   TPLINK_HWID := 0x73b70801
   TPLINK_HWREV := 0x2f
diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk
index dee4b0d161..cd43c61e6e 100644
--- a/target/linux/lantiq/image/vr9.mk
+++ b/target/linux/lantiq/image/vr9.mk
@@ -3,7 +3,7 @@ define Device/alphanetworks_asl56026
   DEVICE_MODEL := ASL56026
   DEVICE_ALT0_VENDOR := BT Openreach
   DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I
-  DEVICE_DTS := ASL56026
+  SOC := vr9
   IMAGE_SIZE := 7488k
 endef
 TARGET_DEVICES += alphanetworks_asl56026
@@ -17,7 +17,7 @@ define Device/arcadyan_arv7519rw22
   DEVICE_ALT1_VENDOR := Astoria Networks
   DEVICE_ALT1_MODEL := ARV7519RW22
   IMAGE_SIZE := 31232k
-  DEVICE_DTS := ARV7519RW22
+  SOC := vr9
   DEVICE_PACKAGES := kmod-usb-dwc2
   SUPPORTED_DEVICES += ARV7519RW22
 endef
@@ -27,7 +27,7 @@ define Device/arcadyan_vg3503j
   DEVICE_VENDOR := BT Openreach
   DEVICE_MODEL := ECI VDSL Modem V-2FUb/R
   IMAGE_SIZE := 8000k
-  DEVICE_DTS := VG3503J
+  SOC := vr9
   SUPPORTED_DEVICES += VG3503J
 endef
 TARGET_DEVICES += arcadyan_vg3503j
@@ -41,7 +41,7 @@ define Device/arcadyan_vgv7510kw22-brn
   DEVICE_ALT0_MODEL := Box 6431
   DEVICE_ALT0_VARIANT := BRN
   IMAGE_SIZE := 7168k
-  DEVICE_DTS := VGV7510KW22BRN
+  SOC := vr9
   SIGNATURE := BRNDA6431
   MAGIC := 0x12345678
   CRC32_POLY := 0x04c11db7
@@ -58,7 +58,7 @@ define Device/arcadyan_vgv7510kw22-nor
   DEVICE_ALT0_MODEL := Box 6431
   DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15232k
-  DEVICE_DTS := VGV7510KW22NOR
+  SOC := vr9
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7510KW22NOR
 endef
@@ -73,7 +73,7 @@ define Device/arcadyan_vgv7519-brn
   DEVICE_ALT0_MODEL := Experiabox 8
   DEVICE_ALT0_VARIANT := BRN
   IMAGE_SIZE := 7168k
-  DEVICE_DTS := VGV7519BRN
+  SOC := vr9
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
   CRC32_POLY := 0x2083b8ed
@@ -90,7 +90,7 @@ define Device/arcadyan_vgv7519-nor
   DEVICE_ALT0_MODEL := Experiabox 8
   DEVICE_ALT0_VARIANT := NOR
   IMAGE_SIZE := 15360k
-  DEVICE_DTS := VGV7519NOR
+  SOC := vr9
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc
   SUPPORTED_DEVICES += VGV7519NOR
 endef
@@ -101,7 +101,7 @@ define Device/avm_fritz3370
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 3370
   DEVICE_VARIANT := Rev. 2
-  DEVICE_DTS := FRITZ3370
+  SOC := vr9
   KERNEL_SIZE := 4096k
   UBINIZE_OPTS := -E 5
   IMAGES += eva-kernel.bin eva-filesystem.bin
@@ -114,7 +114,6 @@ define Device/avm_fritz3370-rev2-hynix
   $(Device/avm_fritz3370)
   DEVICE_MODEL := FRITZ!Box 3370
   DEVICE_VARIANT := Rev. 2 (Hynix NAND)
-  DEVICE_DTS := FRITZ3370-REV2-HYNIX
 endef
 TARGET_DEVICES += avm_fritz3370-rev2-hynix
 
@@ -122,7 +121,6 @@ define Device/avm_fritz3370-rev2-micron
   $(Device/avm_fritz3370)
   DEVICE_MODEL := FRITZ!Box 3370
   DEVICE_VARIANT := Rev. 2 (Micron NAND)
-  DEVICE_DTS := FRITZ3370-REV2-MICRON
 endef
 TARGET_DEVICES += avm_fritz3370-rev2-micron
 
@@ -130,7 +128,7 @@ define Device/avm_fritz7360sl
   $(Device/AVM)
   DEVICE_MODEL := FRITZ!Box 7360 SL
   IMAGE_SIZE := 15744k
-  DEVICE_DTS := FRITZ7360SL
+  SOC := vr9
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += FRITZ7360SL
 endef
@@ -142,7 +140,7 @@ define Device/avm_fritz7362sl
   DEVICE_MODEL := FRITZ!Box 7362 SL
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
-  DEVICE_DTS := FRITZ7362SL
+  SOC := vr9
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs
 endef
 TARGET_DEVICES += avm_fritz7362sl
@@ -152,7 +150,7 @@ define Device/avm_fritz7412
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 7412
   BOARD_NAME := FRITZ7412
-  DEVICE_DTS := FRITZ7412
+  SOC := vr9
   KERNEL_SIZE := 4096k
   IMAGE_SIZE := 49152k
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata
@@ -165,7 +163,7 @@ define Device/bt_homehub-v5a
   DEVICE_MODEL := Home Hub 5
   DEVICE_VARIANT := Type A
   BOARD_NAME := BTHOMEHUBV5A
-  DEVICE_DTS := BTHOMEHUBV5A
+  SOC := vr9
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \
 	kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += BTHOMEHUBV5A
@@ -176,7 +174,7 @@ define Device/buffalo_wbmr-300hpd
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WBMR-300HPD
   IMAGE_SIZE := 15616k
-  DEVICE_DTS := WBMR300
+  SOC := vr9
   DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += WBMR300
 endef
@@ -187,7 +185,7 @@ define Device/lantiq_easy80920-nand
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := VR9 EASY80920
   DEVICE_VARIANT := NAND
-  DEVICE_DTS := EASY80920NAND
+  SOC := vr9
   IMAGE_SIZE := 64512k
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
@@ -197,7 +195,7 @@ define Device/lantiq_easy80920-nor
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := VR9 EASY80920
   DEVICE_VARIANT := NOR
-  DEVICE_DTS := EASY80920NOR
+  SOC := vr9
   IMAGE_SIZE := 7936k
   DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
@@ -206,7 +204,7 @@ TARGET_DEVICES += lantiq_easy80920-nor
 define Device/netgear_dm200
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DM200
-  DEVICE_DTS := DM200
+  SOC := vr9
   IMAGES := sysupgrade.bin factory.img
   IMAGE/sysupgrade.bin := append-kernel | \
 	pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
@@ -226,7 +224,7 @@ define Device/zyxel_p-2812hnu-f1
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F1
   BOARD_NAME := P2812HNUF1
-  DEVICE_DTS := P2812HNUF1
+  SOC := vr9
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport
   KERNEL_SIZE := 3072k
   SUPPORTED_DEVICES += P2812HNUF1
@@ -239,7 +237,7 @@ define Device/zyxel_p-2812hnu-f3
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F3
   BOARD_NAME := P2812HNUF3
-  DEVICE_DTS := P2812HNUF3
+  SOC := vr9
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2
   SUPPORTED_DEVICES += P2812HNUF3
 endef
diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk
index 011de20914..8af2e1c3fc 100644
--- a/target/linux/lantiq/image/xway_legacy.mk
+++ b/target/linux/lantiq/image/xway_legacy.mk
@@ -2,7 +2,7 @@ define Device/arcadyan_arv4518pwr01
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := ARV4518PWR01
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4518PWR01
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -16,7 +16,7 @@ define Device/arcadyan_arv4518pwr01a
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := ARV4518PWR01A
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4518PWR01A
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
@@ -34,7 +34,7 @@ define Device/arcadyan_arv4520pw
   DEVICE_ALT1_VENDOR := Airties
   DEVICE_ALT1_MODEL := WAV-281
   IMAGE_SIZE := 3648k
-  DEVICE_DTS := ARV4520PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -51,7 +51,7 @@ define Device/arcadyan_arv4525pw
   DEVICE_ALT0_MODEL := Speedport W502V
   DEVICE_ALT0_VARIANT := Typ A
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4525PW
+  SOC := danube
   DEVICE_PACKAGES := kmod-ath5k wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
 	kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \
@@ -66,7 +66,7 @@ define Device/arcadyan_arv452cqw
   DEVICE_ALT0_VENDOR := Vodafone
   DEVICE_ALT0_MODEL := Easybox 801
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV452CQW
+  SOC := danube
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \
 	kmod-ath5k wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \