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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
rename to 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
similarity index 75%
rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts
index 98a2ebd98e05d7d243260679f4b45a974755e55a..cbc99fe62082513456d6afc1bd8dc17198c24042 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
rename to 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
similarity index 75%
rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts
index d1d788cc7d5d6d5a28264f1a0c044d94ddb3b2b3..b69613e48f444f5b7efdf3792af731d06244a8fc 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
rename to 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
similarity index 71%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts
index 34f868f484ad65943b96b46136b3bfcdc1450227..ff34068005ac5c29edece77415d38033a8619ffc 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
rename to 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
similarity index 78%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts
index 9617398bbc4bee0cf26cd9d10657321fdf1f23fc..b261a2fa91b5bf3c6b74a82a1986c3d81924f2f9 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi
rename to 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
similarity index 98%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
index 12c448c2e6d4225f04a55d6b78f466276e429048..22ce8caced1e8e71bb1efea52a65a35cd345a7d8 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
index 3f29d319cdf635d5109fe13aef7f2152e31503fe..fa331450bf062a5ae3afc4afd5a8b87a19103adf 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
similarity index 93%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
index 2155f0cb1d839e38547b3abfc018ecb026d17d77..e4719d59e0c0fc0d4650888ea168671523c11269 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
similarity index 93%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
index 3cb00343f5810ac81b6a4f5d64bbf9486e45c990..cba277e6d12e479ddc3905e3ea9e2ff38819f80f 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
similarity index 73%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts
index bbe524e94ef2fcc72d05e137ed318c6d6c440deb..e8d8b4247046971b18834b3f0d06a475e1dc471f 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi
rename to 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
index 571e23454aca2a02c57fc397e94873aab3304e9a..773a49001993d8e96723ddf67a0c18f3f3e97458 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
index 7a3ef418d0494f9e9c239c3a7b15c70dc8b4ac33..397764aac4badfd76dbb53828b5444fb9809fbab 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
index 7eb40bde240176dbec89df2d490a7ed6e821acda..aa632681499ace1f9df843d200a2b5c6a5ab9990 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts
index df941cdb67acff5f1d6e758c11a4941dc8ca276d..f1ecebec3bb1fa7ba9a60665f9c19f5f83030f48 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts
index a3abc6e7078ea68100eb908f68a1a13a7c8e05c5..98421174d3237eed1125fd45c9c38c042e43b4a2 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
index c5da8b564f9a9c372e6f4cf6e51d48a814748c2a..130d49ebd709db0d4021c30af29bf4d28306850b 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts
index 8d45de4ebe4e89db4ea2970ed424323b70c15ae4..880c4edca8e2021b42139d7b1e20a0c1fb0b2d53 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
rename to 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts
index 5a33121d720a7dd84581d75a18a5fe36d259a188..9f6f405a09288578ff31f09831cd3248a6d19466 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
similarity index 92%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
index 2accffaed7dcd99eb6e02cf4d30bdd649e332bf4..613ff3782c472cdfe5426c3ee3a768a26c8422ae 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
rename to 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts
index c51a44bb3d6d3276d28c8934b2e83ff83cc3e7c9..051de0c23ec3e192b06b5371a91de42ae34876e9 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
similarity index 92%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
index aa6a96156fc873cd21579a15d97b33dce66e52ae..2121fbf41d6c63d38cb14f91cb21bf1f8cb1f390 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
rename to 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
similarity index 94%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts
index 15bd0d271351254b2839dfcef9db06cab4c4a75e..1aea98260a077e00b536da1466d9c879ae49cffd 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
similarity index 94%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts
index 7e4a3e11143c05dc26c2802feae9e914b1c98543..a19d168159e0e5a4ede9dc58741f085e515119d8 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
rename to 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
similarity index 97%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 0fbe6396a8faa143f8de0e0cfe81a6342e9e7388..012300ec570a2e5c8decd888e539c7df4f82836c 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
similarity index 98%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index feb92425744369ac50af86ea00e9518d174292bf..a061a482dabfc1d4d72ebd3055472d249eb1440a 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
rename to 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
index 0bf8e1b7efa1d6b3f707bda1e1187d83c4664d6f..585521459be66ad67a51b8a0d18aa288bf49a15b 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
similarity index 94%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
index 6ed6c5d42743a536f30642bc636fe1ee530d68bc..c204c5e0931accbf9a5147b619b2eb84ac5eb39f 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
rename to 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
rename to 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
similarity index 78%
rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts
index 25eb3dac67977df4d2fb846f88a6c6b93ba63c03..9b3055983a88e7d2a44e4c0576647fd09e166130 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
similarity index 94%
rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
index 76875e735d82735632026137cc8f9245f853483a..725aa759d2e08617c03057353279bf851b34454a 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
rename to 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
similarity index 98%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
index 8724e37b478803e1cd398ecaa19dd4bad8a38c61..98f2282579c1b5d061cc9e1c13cea0882aa51117 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
rename to 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
similarity index 98%
rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
index 34805bb9f0493e5e9144838b6d0c07cad8bee4d2..2e25a72a83c2a3fc98591f68dc9ade49c174c5d3 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index d1a04a4a78f8ccd3f25c3455889b0c6cc2947023..4d7aac325b2e90ecd44c78023d29dcfc658bebc3 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
similarity index 96%
rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts
rename to target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
index a6073114600cc69fcdb6a0ca18187d4383d03042..7da153380998ec3c0b6ab417272c3d9ffefb020f 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
similarity index 100%
rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
rename to 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 a2052ef9249d76c98176447793c4be622e5f5159..3060ff920b9a25c417c0ae27f05edc8fd614efa0 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 77afaa8bed429ac2a0ad9c55f06c13f45fa40bfc..c9329a4dd90ad0137564d88a86ef6d5caf191e49 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 272227bdb389c6a87a909f0d052f3357d19f52c9..f86e2d1c68716f1f47193c92dd93a9ff386953f9 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 8171900a6f900dba9b5ee5e8460d0c6369c26f94..2fb5ea061f9077ca7e745a9a31a950123b691d91 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 38ba856cf89848861b78fc4aa3f1faaa7b9c5bee..e6aae1240b87d15ea9cf0991f9f4ce33ba043b40 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 3be40fc94781ad1e30926c93f148bf4289e05a4b..56a7e5ca57d2af45db3c254ac717f78e3b0b0420 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 dee4b0d1617f992ac645d1100f1135861f76e1e1..cd43c61e6ef71573750727f07d3e6fe485866922 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 011de209141d34cec9c115fe60dd06178bf9dd7d..8af2e1c3fcd24c453250b19f60c0f7ce44531d52 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 \