116 files changed, 126 insertions, 126 deletions
diff --git a/target/linux/ramips/dts/CARAMBOLA.dts b/target/linux/ramips/dts/rt3050_8devices_carambola.dts
index aaaea8fd4e..aaaea8fd4e 100644
--- a/target/linux/ramips/dts/CARAMBOLA.dts
+++ b/target/linux/ramips/dts/rt3050_8devices_carambola.dts
diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/rt3050_allnet_all0256n-4m.dts
index 60421a4229..3c152040fa 100644
--- a/target/linux/ramips/dts/ALL0256N-4M.dts
+++ b/target/linux/ramips/dts/rt3050_allnet_all0256n-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ALL0256N.dtsi"
+#include "rt3050_allnet_all0256n.dtsi"
 
 / {
 	compatible = "allnet,all0256n-4m", "allnet,all0256n", "ralink,rt3050-soc";
diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/rt3050_allnet_all0256n-8m.dts
index 3832d1a7d3..e901f3c909 100644
--- a/target/linux/ramips/dts/ALL0256N-8M.dts
+++ b/target/linux/ramips/dts/rt3050_allnet_all0256n-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ALL0256N.dtsi"
+#include "rt3050_allnet_all0256n.dtsi"
 
 / {
 	compatible = "allnet,all0256n-8m", "allnet,all0256n", "ralink,rt3050-soc";
diff --git a/target/linux/ramips/dts/ALL0256N.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi
index d31547c335..d31547c335 100644
--- a/target/linux/ramips/dts/ALL0256N.dtsi
+++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi
diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555-16m.dts
index fce92ff0f3..76781ab113 100644
--- a/target/linux/ramips/dts/ASL26555-16M.dts
+++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555-16m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ASL26555.dtsi"
+#include "rt3050_alphanetworks_asl26555.dtsi"
 
 / {
 	compatible = "alphanetworks,asl26555-16m", "alphanetworks,asl26555", "ralink,rt3050-soc";
diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555-8m.dts
index 8411990be9..3d11de0fab 100644
--- a/target/linux/ramips/dts/ASL26555-8M.dts
+++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ASL26555.dtsi"
+#include "rt3050_alphanetworks_asl26555.dtsi"
 
 / {
 	compatible = "alphanetworks,asl26555-8m", "alphanetworks,asl26555", "ralink,rt3050-soc";
diff --git a/target/linux/ramips/dts/ASL26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi
index d1c21f8082..d1c21f8082 100644
--- a/target/linux/ramips/dts/ASL26555.dtsi
+++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi
diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts
index b924229a7e..b924229a7e 100644
--- a/target/linux/ramips/dts/FREESTATION5.dts
+++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts
diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
index 8f0544e7ef..8f0544e7ef 100644
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts
diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts
index 3b77a4ce3c..3b77a4ce3c 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts
diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts
index ee0cd0ad1f..ee0cd0ad1f 100644
--- a/target/linux/ramips/dts/WL-330N.dts
+++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts
diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts
index 235c90fc4d..235c90fc4d 100644
--- a/target/linux/ramips/dts/WL-330N3G.dts
+++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts
diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts
index 1c44e28fe4..1c44e28fe4 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts
diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts
index 8bc77e422d..8bc77e422d 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts
diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
index a77bfd717f..a77bfd717f 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts
diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
index 69cc5e252a..69cc5e252a 100644
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
diff --git a/target/linux/ramips/dts/DIR-620-A1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts
index 24fdec8ed4..24fdec8ed4 100644
--- a/target/linux/ramips/dts/DIR-620-A1.dts
+++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts
diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts
index 3859812217..3859812217 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts
index 7742561e50..7742561e50 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts
diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts
index 10732cc5ec..10732cc5ec 100644
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts
diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts
index 702d779aa2..702d779aa2 100644
--- a/target/linux/ramips/dts/JHR-N805R.dts
+++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts
diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts
index 61af498fd8..61af498fd8 100644
--- a/target/linux/ramips/dts/NW718.dts
+++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts
diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts
index a2f763cb8b..a2f763cb8b 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts
diff --git a/target/linux/ramips/dts/RUT5XX.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts
index 52638f94e6..52638f94e6 100644
--- a/target/linux/ramips/dts/RUT5XX.dts
+++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts
diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
index e128580ec8..e128580ec8 100644
--- a/target/linux/ramips/dts/W150M.dts
+++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts
diff --git a/target/linux/ramips/dts/TEW-638APB-V2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts
index a014b32802..a014b32802 100644
--- a/target/linux/ramips/dts/TEW-638APB-V2.dts
+++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts
diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts
index 1caec41a4b..1caec41a4b 100644
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts
diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts
index 5c1b47bc03..5c1b47bc03 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts
diff --git a/target/linux/ramips/dts/ATP-52B.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts
index 2fa5c19d04..2fa5c19d04 100644
--- a/target/linux/ramips/dts/ATP-52B.dts
+++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts
diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts
index 97f105a631..97f105a631 100644
--- a/target/linux/ramips/dts/AWAPN2403.dts
+++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts
diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts
index c3a3d2346f..c3a3d2346f 100644
--- a/target/linux/ramips/dts/RT-N13U.dts
+++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts
diff --git a/target/linux/ramips/dts/MR-102N.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
index ffb76e3bf4..ffb76e3bf4 100644
--- a/target/linux/ramips/dts/MR-102N.dts
+++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts
index 372d18e75e..372d18e75e 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts
diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
index 93725e9336..93725e9336 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts
diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts
index 3871b55495..3871b55495 100644
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts
index 06d490cacc..06d490cacc 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts
diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts
index 4b55af0691..4b55af0691 100644
--- a/target/linux/ramips/dts/ESR-9753.dts
+++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts
index cd452fa782..cd452fa782 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts
diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts
index 353cfbf415..353cfbf415 100644
--- a/target/linux/ramips/dts/BROADWAY.dts
+++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts
diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts
index df8a72c8cb..df8a72c8cb 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts
diff --git a/target/linux/ramips/dts/JHR-N825R.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts
index 4c0640b881..4c0640b881 100644
--- a/target/linux/ramips/dts/JHR-N825R.dts
+++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts
diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts
index 9414828594..9414828594 100644
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts
diff --git a/target/linux/ramips/dts/MOFI3500-3GN.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts
index d20f2d2703..d20f2d2703 100644
--- a/target/linux/ramips/dts/MOFI3500-3GN.dts
+++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts
index 3f0d93d8a4..3f0d93d8a4 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts
diff --git a/target/linux/ramips/dts/BC2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts
index 324909e82f..324909e82f 100644
--- a/target/linux/ramips/dts/BC2.dts
+++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts
diff --git a/target/linux/ramips/dts/MINIEMBWIFI.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts
index 2f045c7884..2f045c7884 100644
--- a/target/linux/ramips/dts/MINIEMBWIFI.dts
+++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts
diff --git a/target/linux/ramips/dts/PSR-680W.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts
index 260d0a1444..260d0a1444 100644
--- a/target/linux/ramips/dts/PSR-680W.dts
+++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts
diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
index ab749fc43d..ab749fc43d 100644
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
diff --git a/target/linux/ramips/dts/MZK-WDPR.dts b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts
index 17591268b6..17591268b6 100644
--- a/target/linux/ramips/dts/MZK-WDPR.dts
+++ b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts
diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts
index 31478da694..31478da694 100644
--- a/target/linux/ramips/dts/IP2202.dts
+++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts
diff --git a/target/linux/ramips/dts/PWH2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts
index 3280c93afb..3280c93afb 100644
--- a/target/linux/ramips/dts/PWH2004.dts
+++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts
diff --git a/target/linux/ramips/dts/V22RW-2X2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts
index df56c80819..df56c80819 100644
--- a/target/linux/ramips/dts/V22RW-2X2.dts
+++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts
diff --git a/target/linux/ramips/dts/WL-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts
index 1b31bda736..1b31bda736 100644
--- a/target/linux/ramips/dts/WL-351.dts
+++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts
diff --git a/target/linux/ramips/dts/SL-R7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts
index 3d8a9ec464..3d8a9ec464 100644
--- a/target/linux/ramips/dts/SL-R7205.dts
+++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts
diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
index a463890dea..a463890dea 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts
diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts
index 233a6d2e46..233a6d2e46 100644
--- a/target/linux/ramips/dts/W306R_V20.dts
+++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-4m.dts
index beba805505..12476d238c 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WR512-3GN.dtsi"
+#include "rt3052_unbranded_wr512-3gn.dtsi"
 
 / {
 	compatible = "unbranded,wr512-3gn-4m", "unbranded,wr512-3gn", "ralink,rt3052-soc";
diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-8m.dts
index 118c69a340..c21b59168f 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WR512-3GN.dtsi"
+#include "rt3052_unbranded_wr512-3gn.dtsi"
 
 / {
 	compatible = "unbranded,wr512-3gn-8m", "unbranded,wr512-3gn", "ralink,rt3052-soc";
diff --git a/target/linux/ramips/dts/WR512-3GN.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi
index 5761b8b532..5761b8b532 100644
--- a/target/linux/ramips/dts/WR512-3GN.dtsi
+++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi
diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts
index 2d1b416ce5..2d1b416ce5 100644
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts
index d67c2e0ec5..d67c2e0ec5 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
index 937278db92..937278db92 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts
diff --git a/target/linux/ramips/dts/kn.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
index 1f9928e59a..1f9928e59a 100644
--- a/target/linux/ramips/dts/kn.dts
+++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts
index 625e1616d8..625e1616d8 100644
--- a/target/linux/ramips/dts/NBG-419N.dts
+++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts
diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts
index a604ec1511..a604ec1511 100644
--- a/target/linux/ramips/dts/ALL5002.dts
+++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts
diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts
index 79d4717f57..79d4717f57 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts
diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
index 74fd4af753..74fd4af753 100644
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts
diff --git a/target/linux/ramips/dts/NBG-419N2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
index e150eff9e8..e150eff9e8 100644
--- a/target/linux/ramips/dts/NBG-419N2.dts
+++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
diff --git a/target/linux/ramips/dts/PX-4885-4M.dts b/target/linux/ramips/dts/rt5350_7links_px-4885-4m.dts
index ee2068f8f4..66e2c1924c 100644
--- a/target/linux/ramips/dts/PX-4885-4M.dts
+++ b/target/linux/ramips/dts/rt5350_7links_px-4885-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "PX-4885.dtsi"
+#include "rt5350_7links_px-4885.dtsi"
 
 / {
 	compatible = "7links,px-4885-4m", "7links,px-4885", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/PX-4885-8M.dts b/target/linux/ramips/dts/rt5350_7links_px-4885-8m.dts
index a52ba2edae..f3d9926702 100644
--- a/target/linux/ramips/dts/PX-4885-8M.dts
+++ b/target/linux/ramips/dts/rt5350_7links_px-4885-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "PX-4885.dtsi"
+#include "rt5350_7links_px-4885.dtsi"
 
 / {
 	compatible = "7links,px-4885-8m", "7links,px-4885", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/PX-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi
index 032a89cd1a..032a89cd1a 100644
--- a/target/linux/ramips/dts/PX-4885.dtsi
+++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi
diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts
index 111119eea4..111119eea4 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts
index 8a3488a7e0..8a3488a7e0 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb-4m.dts
index c8045a0f90..843cb51c3e 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "AWM002-EVB.dtsi"
+#include "rt5350_asiarf_awm002-evb.dtsi"
 
 / {
 	compatible = "asiarf,awm002-evb-4m", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb-8m.dts
index d7e9bd8340..46ba3a7e12 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "AWM002-EVB.dtsi"
+#include "rt5350_asiarf_awm002-evb.dtsi"
 
 / {
 	compatible = "asiarf,awm002-evb-8m", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/AWM002-EVB.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi
index 384b2efec0..384b2efec0 100644
--- a/target/linux/ramips/dts/AWM002-EVB.dtsi
+++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi
diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
index 0fff5e8b5c..0fff5e8b5c 100644
--- a/target/linux/ramips/dts/DCS-930L-B1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts
diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts
index 2b6af163bc..2b6af163bc 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts
diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts
index 040a223986..040a223986 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts
diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts
index 7a0323e219..7a0323e219 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
index a08ea5d03c..a08ea5d03c 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts
index a69ed4bd09..a69ed4bd09 100644
--- a/target/linux/ramips/dts/WIZARD8800.dts
+++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts
diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts
index 328351a550..328351a550 100644
--- a/target/linux/ramips/dts/MPRA1.dts
+++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts
diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts
index fedb5b061e..fedb5b061e 100644
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts
diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts
index 7b2791fa62..7b2791fa62 100644
--- a/target/linux/ramips/dts/HLKRM04.dts
+++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts
diff --git a/target/linux/ramips/dts/HT-TM02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts
index 4e73c6988d..4e73c6988d 100644
--- a/target/linux/ramips/dts/HT-TM02.dts
+++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts
diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
index 122c70e21f..122c70e21f 100644
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/rt5350_nexx_wt1520-4m.dts
index 1f54efe429..e5109c96b3 100644
--- a/target/linux/ramips/dts/WT1520-4M.dts
+++ b/target/linux/ramips/dts/rt5350_nexx_wt1520-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WT1520.dtsi"
+#include "rt5350_nexx_wt1520.dtsi"
 
 / {
 	compatible = "nexx,wt1520-4m", "nexx,wt1520", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/rt5350_nexx_wt1520-8m.dts
index e238826aae..a0e3d3b5bc 100644
--- a/target/linux/ramips/dts/WT1520-8M.dts
+++ b/target/linux/ramips/dts/rt5350_nexx_wt1520-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WT1520.dtsi"
+#include "rt5350_nexx_wt1520.dtsi"
 
 / {
 	compatible = "nexx,wt1520-8m", "nexx,wt1520", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi
index 28d498bc87..28d498bc87 100644
--- a/target/linux/ramips/dts/WT1520.dtsi
+++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi
diff --git a/target/linux/ramips/dts/NIXCORE-16M.dts b/target/linux/ramips/dts/rt5350_nixcore_x1-16m.dts
index 328217787f..7904701742 100644
--- a/target/linux/ramips/dts/NIXCORE-16M.dts
+++ b/target/linux/ramips/dts/rt5350_nixcore_x1-16m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "NIXCORE.dtsi"
+#include "rt5350_nixcore_x1.dtsi"
 
 / {
 	compatible = "nixcore,x1-16m", "nixcore,x1", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/NIXCORE-8M.dts b/target/linux/ramips/dts/rt5350_nixcore_x1-8m.dts
index f32bcf3f49..f02bb4c3db 100644
--- a/target/linux/ramips/dts/NIXCORE-8M.dts
+++ b/target/linux/ramips/dts/rt5350_nixcore_x1-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "NIXCORE.dtsi"
+#include "rt5350_nixcore_x1.dtsi"
 
 / {
 	compatible = "nixcore,x1-8m", "nixcore,x1", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/NIXCORE.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi
index 1702d74db7..1702d74db7 100644
--- a/target/linux/ramips/dts/NIXCORE.dtsi
+++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino-evb.dts
index 5c7b3c7c42..57164ea8ac 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts
+++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino-evb.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "RT5350F-OLINUXINO.dtsi"
+#include "rt5350_olimex_rt5350f-olinuxino.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dts
index 2e0dcb1558..f3b2c948e3 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts
+++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "RT5350F-OLINUXINO.dtsi"
+#include "rt5350_olimex_rt5350f-olinuxino.dtsi"
 
 / {
 	compatible = "olimex,rt5350f-olinuxino", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
index 88b412c8d6..88b412c8d6 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
+++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
diff --git a/target/linux/ramips/dts/MINIEMBPLUG.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts
index 5db1ce48a1..5db1ce48a1 100644
--- a/target/linux/ramips/dts/MINIEMBPLUG.dts
+++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts
diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts
index 41fb6e06d8..41fb6e06d8 100644
--- a/target/linux/ramips/dts/MZK-DP150N.dts
+++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts
diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts
index 1c894aff12..1c894aff12 100644
--- a/target/linux/ramips/dts/M3.dts
+++ b/target/linux/ramips/dts/rt5350_poray_m3.dts
diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/rt5350_poray_m4-4m.dts
index 53a58b3d49..f917d344d3 100644
--- a/target/linux/ramips/dts/M4-4M.dts
+++ b/target/linux/ramips/dts/rt5350_poray_m4-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "M4.dtsi"
+#include "rt5350_poray_m4.dtsi"
 
 / {
 	compatible = "poray,m4-4m", "poray,m4", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/rt5350_poray_m4-8m.dts
index b947a36d08..ac689f8598 100644
--- a/target/linux/ramips/dts/M4-8M.dts
+++ b/target/linux/ramips/dts/rt5350_poray_m4-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "M4.dtsi"
+#include "rt5350_poray_m4.dtsi"
 
 / {
 	compatible = "poray,m4-8m", "poray,m4", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/M4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi
index df8db131e9..df8db131e9 100644
--- a/target/linux/ramips/dts/M4.dtsi
+++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi
diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts
index 7e3d8b6f03..7e3d8b6f03 100644
--- a/target/linux/ramips/dts/X5.dts
+++ b/target/linux/ramips/dts/rt5350_poray_x5.dts
diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts
index 3b6d60478f..3b6d60478f 100644
--- a/target/linux/ramips/dts/X8.dts
+++ b/target/linux/ramips/dts/rt5350_poray_x8.dts
diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts
index 9d13625516..9d13625516 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts
diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts
index 00e3d2df12..00e3d2df12 100644
--- a/target/linux/ramips/dts/TEW-714TRU.dts
+++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts
diff --git a/target/linux/ramips/dts/A5-V11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts
index 707963d691..707963d691 100644
--- a/target/linux/ramips/dts/A5-V11.dts
+++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts
diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/rt5350_vocore_vocore-16m.dts
index 30781b53b2..5d9a4e96e2 100644
--- a/target/linux/ramips/dts/VOCORE-16M.dts
+++ b/target/linux/ramips/dts/rt5350_vocore_vocore-16m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VOCORE.dtsi"
+#include "rt5350_vocore_vocore.dtsi"
 
 / {
 	compatible = "vocore,vocore-16m", "vocore,vocore", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/rt5350_vocore_vocore-8m.dts
index ec301965c8..bfc307dfc8 100644
--- a/target/linux/ramips/dts/VOCORE-8M.dts
+++ b/target/linux/ramips/dts/rt5350_vocore_vocore-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VOCORE.dtsi"
+#include "rt5350_vocore_vocore.dtsi"
 
 / {
 	compatible = "vocore,vocore-8m", "vocore,vocore", "ralink,rt5350-soc";
diff --git a/target/linux/ramips/dts/VOCORE.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
index c5c26e77c8..c5c26e77c8 100644
--- a/target/linux/ramips/dts/VOCORE.dtsi
+++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
diff --git a/target/linux/ramips/dts/NCS601W.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts
index ff6ccd2247..ff6ccd2247 100644
--- a/target/linux/ramips/dts/NCS601W.dts
+++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts
diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts
index f88d5ae63f..f88d5ae63f 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts
diff --git a/target/linux/ramips/dts/ZL5900V2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
index d5d0ca3728..d5d0ca3728 100644
--- a/target/linux/ramips/dts/ZL5900V2.dts
+++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts
diff --git a/target/linux/ramips/dts/kn_st.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts
index 16ab9567c0..16ab9567c0 100644
--- a/target/linux/ramips/dts/kn_st.dts
+++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts
diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/rt5352_belkin_f7c027.dts
index f3bf00e30a..f3bf00e30a 100644
--- a/target/linux/ramips/dts/F7C027.dts
+++ b/target/linux/ramips/dts/rt5352_belkin_f7c027.dts
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 19fde0f2e1..e5b3adf937 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -23,7 +23,7 @@ endef
 
 
 define Device/tenda_3g150b
-  DTS := 3G150B
+  MTK_SOC := rt5350
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
@@ -35,7 +35,7 @@ endef
 TARGET_DEVICES += tenda_3g150b
 
 define Device/tenda_3g300m
-  DTS := 3G300M
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME := 3G150M_SPI Kernel Image
   DEVICE_VENDOR := Tenda
@@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += tenda_3g300m
 
 define Device/edimax_3g-6200n
-  DTS := 3G-6200N
+  MTK_SOC := rt3050
   IMAGE_SIZE := 3648k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
@@ -58,7 +58,7 @@ endef
 TARGET_DEVICES += edimax_3g-6200n
 
 define Device/edimax_3g-6200nl
-  DTS := 3G-6200NL
+  MTK_SOC := rt3050
   IMAGE_SIZE := 3648k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
@@ -70,7 +70,7 @@ endef
 TARGET_DEVICES += edimax_3g-6200nl
 
 define Device/unbranded_a5-v11
-  DTS := A5-V11
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -83,7 +83,7 @@ endef
 TARGET_DEVICES += unbranded_a5-v11
 
 define Device/airlive_air3gii
-  DTS := AIR3GII
+  MTK_SOC := rt5350
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AirLive
@@ -93,7 +93,7 @@ endef
 TARGET_DEVICES += airlive_air3gii
 
 define Device/allnet_all0256n-4m
-  DTS := ALL0256N-4M
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL0256N
@@ -104,7 +104,7 @@ endef
 TARGET_DEVICES += allnet_all0256n-4m
 
 define Device/allnet_all0256n-8m
-  DTS := ALL0256N-8M
+  MTK_SOC := rt3050
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL0256N
   DEVICE_VARIANT := 8M
@@ -114,7 +114,7 @@ endef
 TARGET_DEVICES += allnet_all0256n-8m
 
 define Device/allnet_all5002
-  DTS := ALL5002
+  MTK_SOC := rt3352
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL5002
@@ -125,7 +125,7 @@ endef
 TARGET_DEVICES += allnet_all5002
 
 define Device/allnet_all5003
-  DTS := ALL5003
+  MTK_SOC := rt5350
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Allnet
   DEVICE_MODEL := ALL5003
@@ -136,7 +136,7 @@ endef
 TARGET_DEVICES += allnet_all5003
 
 define Device/alphanetworks_asl26555-8m
-  DTS := ASL26555-8M
+  MTK_SOC := rt3050
   IMAGE_SIZE := 7744k
   DEVICE_VENDOR := Alpha
   DEVICE_MODEL := ASL26555
@@ -146,7 +146,7 @@ endef
 TARGET_DEVICES += alphanetworks_asl26555-8m
 
 define Device/alphanetworks_asl26555-16m
-  DTS := ASL26555-16M
+  MTK_SOC := rt3050
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := Alpha
   DEVICE_MODEL := ASL26555
@@ -157,7 +157,7 @@ endef
 TARGET_DEVICES += alphanetworks_asl26555-16m
 
 define Device/argus_atp-52b
-  DTS := ATP-52B
+  MTK_SOC := rt3052
   IMAGE_SIZE := 7808k
   DEVICE_VENDOR := Argus
   DEVICE_MODEL := ATP-52B
@@ -166,7 +166,7 @@ endef
 TARGET_DEVICES += argus_atp-52b
 
 define Device/asiarf_awm002-evb-4m
-  DTS := AWM002-EVB-4M
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AsiaRF
   DEVICE_MODEL := AWM002-EVB
@@ -178,7 +178,7 @@ endef
 TARGET_DEVICES += asiarf_awm002-evb-4m
 
 define Device/asiarf_awm002-evb-8m
-  DTS := AWM002-EVB-8M
+  MTK_SOC := rt5350
   DEVICE_VENDOR := AsiaRF
   DEVICE_MODEL := AWM002-EVB/AWM003-EVB
   DEVICE_VARIANT := 8M
@@ -189,7 +189,7 @@ endef
 TARGET_DEVICES += asiarf_awm002-evb-8m
 
 define Device/asiarf_awapn2403
-  DTS := AWAPN2403
+  MTK_SOC := rt3052
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := AsiaRF
@@ -199,7 +199,7 @@ endef
 TARGET_DEVICES += asiarf_awapn2403
 
 define Device/nexaira_bc2
-  DTS := BC2
+  MTK_SOC := rt3052
   DEVICE_VENDOR := NexAira
   DEVICE_MODEL := BC2
   SUPPORTED_DEVICES += bc2
@@ -207,7 +207,7 @@ endef
 TARGET_DEVICES += nexaira_bc2
 
 define Device/hauppauge_broadway
-  DTS := BROADWAY
+  MTK_SOC := rt3052
   IMAGE_SIZE := 7744k
   UIMAGE_NAME:= Broadway Kernel Image
   DEVICE_VENDOR := Hauppauge
@@ -218,8 +218,8 @@ endef
 TARGET_DEVICES += hauppauge_broadway
 
 define Device/8devices_carambola
-  DTS := CARAMBOLA
-  DEVICE_VENDOR := 8devices 
+  MTK_SOC := rt3050
+  DEVICE_VENDOR := 8devices
   DEVICE_MODEL := Carambola
   DEVICE_PACKAGES :=
   SUPPORTED_DEVICES += carambola
@@ -227,7 +227,7 @@ endef
 TARGET_DEVICES += 8devices_carambola
 
 define Device/huawei_d105
-  DTS := D105
+  MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Huawei
@@ -237,7 +237,7 @@ endef
 TARGET_DEVICES += huawei_d105
 
 define Device/dlink_dap-1350
-  DTS := DAP-1350
+  MTK_SOC := rt3052
   IMAGES += factory.bin factory-NA.bin
   IMAGE_SIZE := 7488k
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -251,7 +251,7 @@ endef
 TARGET_DEVICES += dlink_dap-1350
 
 define Device/dlink_dcs-930
-  DTS := DCS-930
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DCS-930
@@ -261,7 +261,7 @@ endef
 TARGET_DEVICES += dlink_dcs-930
 
 define Device/dlink_dcs-930l-b1
-  DTS := DCS-930L-B1
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DCS-930L
@@ -272,7 +272,7 @@ endef
 TARGET_DEVICES += dlink_dcs-930l-b1
 
 define Device/dlink_dir-300-b1
-  DTS := DIR-300-B1
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -285,7 +285,7 @@ endef
 TARGET_DEVICES += dlink_dir-300-b1
 
 define Device/dlink_dir-300-b7
-  DTS := DIR-300-B7
+  MTK_SOC := rt5350
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := D-Link
@@ -296,7 +296,7 @@ endef
 TARGET_DEVICES += dlink_dir-300-b7
 
 define Device/dlink_dir-320-b1
-  DTS := DIR-320-B1
+  MTK_SOC := rt5350
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-320
   DEVICE_VARIANT := B1
@@ -305,7 +305,7 @@ endef
 TARGET_DEVICES += dlink_dir-320-b1
 
 define Device/dlink_dir-600-b1
-  DTS := DIR-600-B1
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -319,7 +319,7 @@ TARGET_DEVICES += dlink_dir-600-b1
 
 define Device/dlink_dir-610-a1
   $(Device/seama)
-  DTS := DIR-610-A1
+  MTK_SOC := rt5350
   BLOCKSIZE := 4k
   SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610
   KERNEL := $(KERNEL_DTB)
@@ -333,7 +333,7 @@ endef
 TARGET_DEVICES += dlink_dir-610-a1
 
 define Device/dlink_dir-615-d
-  DTS := DIR-615-D
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -347,7 +347,7 @@ TARGET_DEVICES += dlink_dir-615-d
 
 
 define Device/dlink_dir-615-h1
-  DTS := DIR-615-H1
+  MTK_SOC := rt3352
   BLOCKSIZE := 4k
   IMAGES += factory.bin
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
@@ -361,7 +361,7 @@ endef
 TARGET_DEVICES += dlink_dir-615-h1
 
 define Device/dlink_dir-620-a1
-  DTS := DIR-620-A1
+  MTK_SOC := rt3050
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-620
   DEVICE_VARIANT := A1
@@ -370,7 +370,7 @@ endef
 TARGET_DEVICES += dlink_dir-620-a1
 
 define Device/dlink_dir-620-d1
-  DTS := DIR-620-D1
+  MTK_SOC := rt3352
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-620
   DEVICE_VARIANT := D1
@@ -379,7 +379,7 @@ endef
 TARGET_DEVICES += dlink_dir-620-d1
 
 define Device/dlink_dwr-512-b
-  DTS := DWR-512-B
+  MTK_SOC := rt5350
   IMAGE_SIZE := 7800k
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-512
@@ -399,7 +399,7 @@ endef
 TARGET_DEVICES += dlink_dwr-512-b
 
 define Device/engenius_esr-9753
-  DTS := ESR-9753
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := EnGenius
@@ -409,7 +409,7 @@ endef
 TARGET_DEVICES += engenius_esr-9753
 
 define Device/belkin_f5d8235-v2
-  DTS := F5D8235_V2
+  MTK_SOC := rt3052
   IMAGE_SIZE := 7744k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F5D8235
@@ -420,7 +420,7 @@ endef
 TARGET_DEVICES += belkin_f5d8235-v2
 
 define Device/belkin_f7c027
-  DTS := F7C027
+  MTK_SOC := rt5352
   IMAGE_SIZE := 7616k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F7C027
@@ -430,7 +430,7 @@ endef
 TARGET_DEVICES += belkin_f7c027
 
 define Device/fon_fonera-20n
-  DTS := FONERA20N
+  MTK_SOC := rt3052
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s RSDK -m NL1T -f 0x50000 -S 0xc0000
@@ -442,7 +442,7 @@ endef
 TARGET_DEVICES += fon_fonera-20n
 
 define Device/arcwireless_freestation5
-  DTS := FREESTATION5
+  MTK_SOC := rt3050
   DEVICE_VENDOR := ARC Wireless
   DEVICE_MODEL := FreeStation
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
@@ -451,7 +451,7 @@ endef
 TARGET_DEVICES += arcwireless_freestation5
 
 define Device/huawei_hg255d
-  DTS := HG255D
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := HuaWei
   DEVICE_MODEL := HG255D
@@ -460,7 +460,7 @@ endef
 TARGET_DEVICES += huawei_hg255d
 
 define Device/hilink_hlk-rm04
-  DTS := HLKRM04
+  MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header
@@ -471,7 +471,7 @@ endef
 TARGET_DEVICES += hilink_hlk-rm04
 
 define Device/hootoo_ht-tm02
-  DTS := HT-TM02
+  MTK_SOC := rt5350
   DEVICE_VENDOR := HooToo
   DEVICE_MODEL := HT-TM02
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
@@ -480,7 +480,7 @@ endef
 TARGET_DEVICES += hootoo_ht-tm02
 
 define Device/aztech_hw550-3g
-  DTS := HW550-3G
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Aztech
   DEVICE_MODEL := HW550-3G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
@@ -489,7 +489,7 @@ endef
 TARGET_DEVICES += aztech_hw550-3g
 
 define Device/poray_ip2202
-  DTS := IP2202
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Poray
   DEVICE_MODEL := IP2202
   SUPPORTED_DEVICES += ip2202
@@ -497,7 +497,7 @@ endef
 TARGET_DEVICES += poray_ip2202
 
 define Device/jcg_jhr-n805r
-  DTS := JHR-N805R
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -509,7 +509,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n805r
 
 define Device/jcg_jhr-n825r
-  DTS := JHR-N825R
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -521,7 +521,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n825r
 
 define Device/jcg_jhr-n926r
-  DTS := JHR-N926R
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -533,7 +533,7 @@ endef
 TARGET_DEVICES += jcg_jhr-n926r
 
 define Device/intenso_memory2move
-  DTS := M2M
+  MTK_SOC := rt5350
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := Intenso
   DEVICE_MODEL := Memory 2 Move
@@ -545,7 +545,7 @@ endef
 TARGET_DEVICES += intenso_memory2move
 
 define Device/poray_m3
-  DTS := M3
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -559,7 +559,7 @@ endef
 TARGET_DEVICES += poray_m3
 
 define Device/poray_m4-4m
-  DTS := M4-4M
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -574,7 +574,7 @@ endef
 TARGET_DEVICES += poray_m4-4m
 
 define Device/poray_m4-8m
-  DTS := M4-8M
+  MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
@@ -587,7 +587,7 @@ endef
 TARGET_DEVICES += poray_m4-8m
 
 define Device/omnima_miniembplug
-  DTS := MINIEMBPLUG
+  MTK_SOC := rt5350
   DEVICE_VENDOR := Omnima
   DEVICE_MODEL := MiniEMBPlug
   SUPPORTED_DEVICES += miniembplug
@@ -595,7 +595,7 @@ endef
 TARGET_DEVICES += omnima_miniembplug
 
 define Device/omnima_miniembwifi
-  DTS := MINIEMBWIFI
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Omnima
   DEVICE_MODEL := MiniEMBWiFi
   SUPPORTED_DEVICES += miniembwifi
@@ -603,7 +603,7 @@ endef
 TARGET_DEVICES += omnima_miniembwifi
 
 define Device/mofinetwork_mofi3500-3gn
-  DTS := MOFI3500-3GN
+  MTK_SOC := rt3052
   DEVICE_VENDOR := MoFi Network
   DEVICE_MODEL := MOFI3500-3GN
   SUPPORTED_DEVICES += mofi3500-3gn
@@ -611,7 +611,7 @@ endef
 TARGET_DEVICES += mofinetwork_mofi3500-3gn
 
 define Device/hame_mpr-a1
-  DTS := MPRA1
+  MTK_SOC := rt5350
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
@@ -624,7 +624,7 @@ endef
 TARGET_DEVICES += hame_mpr-a1
 
 define Device/hame_mpr-a2
-  DTS := MPRA2
+  MTK_SOC := rt5350
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := HAME
   DEVICE_MODEL := MPR
@@ -635,7 +635,7 @@ endef
 TARGET_DEVICES += hame_mpr-a2
 
 define Device/aximcom_mr-102n
-  DTS := MR-102N
+  MTK_SOC := rt3052
   DEVICE_VENDOR := AXIMCom
   DEVICE_MODEL := MR-102N
   SUPPORTED_DEVICES += mr-102n
@@ -643,7 +643,7 @@ endef
 TARGET_DEVICES += aximcom_mr-102n
 
 define Device/planex_mzk-dp150n
-  DTS := MZK-DP150N
+  MTK_SOC := rt5350
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Planex
@@ -654,7 +654,7 @@ endef
 TARGET_DEVICES += planex_mzk-dp150n
 
 define Device/planex_mzk-w300nh2
-  DTS := MZK-W300NH2
+  MTK_SOC := rt3052
   IMAGE_SIZE := 3648k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
@@ -666,7 +666,7 @@ endef
 TARGET_DEVICES += planex_mzk-w300nh2
 
 define Device/planex_mzk-wdpr
-  DTS := MZK-WDPR
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-WDPR
   SUPPORTED_DEVICES += mzk-wdpr
@@ -674,7 +674,7 @@ endef
 TARGET_DEVICES += planex_mzk-wdpr
 
 define Device/zyxel_nbg-419n
-  DTS := NBG-419N
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := ZyXEL
@@ -684,7 +684,7 @@ endef
 TARGET_DEVICES += zyxel_nbg-419n
 
 define Device/zyxel_nbg-419n-v2
-  DTS := NBG-419N2
+  MTK_SOC := rt3352
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := NBG-419N
@@ -694,7 +694,7 @@ endef
 TARGET_DEVICES += zyxel_nbg-419n-v2
 
 define Device/wansview_ncs601w
-  DTS := NCS601W
+  MTK_SOC := rt5350
   DEVICE_VENDOR := Wansview
   DEVICE_MODEL := NCS601W
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
@@ -704,7 +704,7 @@ endef
 TARGET_DEVICES += wansview_ncs601w
 
 define Device/nixcore_x1-8m
-  DTS := NIXCORE-8M
+  MTK_SOC := rt5350
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Nixcore
   DEVICE_MODEL := X1
@@ -715,7 +715,7 @@ endef
 TARGET_DEVICES += nixcore_x1-8m
 
 define Device/nixcore_x1-16m
-  DTS := NIXCORE-16M
+  MTK_SOC := rt5350
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Nixcore
   DEVICE_MODEL := X1
@@ -726,7 +726,7 @@ endef
 TARGET_DEVICES += nixcore_x1-16m
 
 define Device/netcore_nw718
-  DTS := NW718
+  MTK_SOC := rt3050
   IMAGE_SIZE := 3712k
   UIMAGE_NAME:= ARA1B4NCRNW718;1
   DEVICE_VENDOR := Netcore
@@ -736,7 +736,7 @@ endef
 TARGET_DEVICES += netcore_nw718
 
 define Device/petatel_psr-680w
-  DTS := PSR-680W
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Petatel
@@ -746,7 +746,7 @@ endef
 TARGET_DEVICES += petatel_psr-680w
 
 define Device/prolink_pwh2004
-  DTS := PWH2004
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Prolink
   DEVICE_MODEL := PWH2004
   DEVICE_PACKAGES :=
@@ -755,7 +755,7 @@ endef
 TARGET_DEVICES += prolink_pwh2004
 
 define Device/7links_px-4885-4m
-  DTS := PX-4885-4M
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := 7Links
   DEVICE_MODEL := PX-4885
@@ -767,7 +767,7 @@ endef
 TARGET_DEVICES += 7links_px-4885-4m
 
 define Device/7links_px-4885-8m
-  DTS := PX-4885-8M
+  MTK_SOC := rt5350
   DEVICE_VENDOR := 7Links
   DEVICE_MODEL := PX-4885
   DEVICE_VARIANT := 8M
@@ -778,7 +778,7 @@ endef
 TARGET_DEVICES += 7links_px-4885-8m
 
 define Device/olimex_rt5350f-olinuxino
-  DTS := RT5350F-OLINUXINO
+  MTK_SOC := rt5350
   DEVICE_VENDOR := OLIMEX
   DEVICE_MODEL := RT5350F-OLinuXino
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
@@ -789,7 +789,7 @@ endef
 TARGET_DEVICES += olimex_rt5350f-olinuxino
 
 define Device/olimex_rt5350f-olinuxino-evb
-  DTS := RT5350F-OLINUXINO-EVB
+  MTK_SOC := rt5350
   DEVICE_VENDOR := OLIMEX
   DEVICE_MODEL := RT5350F-OLinuXino-EVB
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
@@ -800,7 +800,7 @@ endef
 TARGET_DEVICES += olimex_rt5350f-olinuxino-evb
 
 define Device/asus_rt-g32-b1
-  DTS := RT-G32-B1
+  MTK_SOC := rt3050
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
@@ -811,7 +811,7 @@ endef
 TARGET_DEVICES += asus_rt-g32-b1
 
 define Device/asus_rt-n10-plus
-  DTS := RT-N10-PLUS
+  MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
@@ -821,7 +821,7 @@ endef
 TARGET_DEVICES += asus_rt-n10-plus
 
 define Device/asus_rt-n13u
-  DTS := RT-N13U
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N13U
   DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
@@ -830,7 +830,7 @@ endef
 TARGET_DEVICES += asus_rt-n13u
 
 define Device/teltonika_rut5xx
-  DTS := RUT5XX
+  MTK_SOC := rt3050
   DEVICE_VENDOR := Teltonika
   DEVICE_MODEL := RUT5XX
   DEVICE_PACKAGES := om-watchdog
@@ -839,7 +839,7 @@ endef
 TARGET_DEVICES += teltonika_rut5xx
 
 define Device/skyline_sl-r7205
-  DTS := SL-R7205
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Skyline
@@ -849,7 +849,7 @@ endef
 TARGET_DEVICES += skyline_sl-r7205
 
 define Device/trendnet_tew-638apb-v2
-  DTS := TEW-638APB-V2
+  MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
@@ -862,7 +862,7 @@ endef
 TARGET_DEVICES += trendnet_tew-638apb-v2
 
 define Device/trendnet_tew-714tru
-  DTS := TEW-714TRU
+  MTK_SOC := rt5350
   DEVICE_VENDOR := TRENDnet
   DEVICE_MODEL := TEW-714TRU
   SUPPORTED_DEVICES += tew-714tru
@@ -870,7 +870,7 @@ endef
 TARGET_DEVICES += trendnet_tew-714tru
 
 define Device/upvel_ur-326n4g
-  DTS := UR-326N4G
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := UPVEL
@@ -881,7 +881,7 @@ endef
 TARGET_DEVICES += upvel_ur-326n4g
 
 define Device/upvel_ur-336un
-  DTS := UR-336UN
+  MTK_SOC := rt3052
   DEVICE_VENDOR := UPVEL
   DEVICE_MODEL := UR-336UN
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
@@ -890,7 +890,7 @@ endef
 TARGET_DEVICES += upvel_ur-336un
 
 define Device/ralink_v22rw-2x2
-  DTS := V22RW-2X2
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Ralink
@@ -900,7 +900,7 @@ endef
 TARGET_DEVICES += ralink_v22rw-2x2
 
 define Device/vocore_vocore-8m
-  DTS := VOCORE-8M
+  MTK_SOC := rt5350
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore
@@ -913,7 +913,7 @@ endef
 TARGET_DEVICES += vocore_vocore-8m
 
 define Device/vocore_vocore-16m
-  DTS := VOCORE-16M
+  MTK_SOC := rt5350
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore
@@ -926,7 +926,7 @@ endef
 TARGET_DEVICES += vocore_vocore-16m
 
 define Device/tenda_w150m
-  DTS := W150M
+  MTK_SOC := rt3050
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= W150M Kernel Image
   DEVICE_VENDOR := Tenda
@@ -936,7 +936,7 @@ endef
 TARGET_DEVICES += tenda_w150m
 
 define Device/tenda_w306r-v2
-  DTS := W306R_V20
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= linkn Kernel Image
   DEVICE_VENDOR := Tenda
@@ -947,7 +947,7 @@ endef
 TARGET_DEVICES += tenda_w306r-v2
 
 define Device/alfa-network_w502u
-  DTS := W502U
+  MTK_SOC := rt3052
   DEVICE_VENDOR := ALFA
   DEVICE_MODEL := Networks W502U
   SUPPORTED_DEVICES += w502u
@@ -955,7 +955,7 @@ endef
 TARGET_DEVICES += alfa-network_w502u
 
 define Device/sparklan_wcr-150gn
-  DTS := WCR150GN
+  MTK_SOC := rt3050
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Sparklan
@@ -965,7 +965,7 @@ endef
 TARGET_DEVICES += sparklan_wcr-150gn
 
 define Device/buffalo_whr-g300n
-  DTS := WHR-G300N
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
   DEVICE_VENDOR := Buffalo
@@ -978,7 +978,7 @@ endef
 TARGET_DEVICES += buffalo_whr-g300n
 
 define Device/easyacc_wizard-8800
-  DTS := WIZARD8800
+  MTK_SOC := rt5350
   UIMAGE_NAME:= Linux Kernel Image
   DEVICE_VENDOR := EasyAcc
   DEVICE_MODEL := WIZARD 8800
@@ -987,7 +987,7 @@ endef
 TARGET_DEVICES += easyacc_wizard-8800
 
 define Device/wiznet_wizfi630a
-  DTS := WIZFI630A
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WIZnet
   DEVICE_MODEL := WizFi630A
@@ -996,7 +996,7 @@ endef
 TARGET_DEVICES += wiznet_wizfi630a
 
 define Device/asus_wl-330n
-  DTS := WL-330N
+  MTK_SOC := rt3050
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
@@ -1006,7 +1006,7 @@ endef
 TARGET_DEVICES += asus_wl-330n
 
 define Device/asus_wl-330n3g
-  DTS := WL-330N3G
+  MTK_SOC := rt3050
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
@@ -1017,7 +1017,7 @@ endef
 TARGET_DEVICES += asus_wl-330n3g
 
 define Device/sitecom_wl-351
-  DTS := WL-351
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Sitecom
@@ -1028,7 +1028,7 @@ endef
 TARGET_DEVICES += sitecom_wl-351
 
 define Device/netgear_wnce2001
-  DTS := WNCE2001
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin factory-NA.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -1042,7 +1042,7 @@ endef
 TARGET_DEVICES += netgear_wnce2001
 
 define Device/unbranded_wr512-3gn-4m
-  DTS := WR512-3GN-4M
+  MTK_SOC := rt3052
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Ralink
   DEVICE_MODEL := WR512-3GN
@@ -1052,7 +1052,7 @@ endef
 TARGET_DEVICES += unbranded_wr512-3gn-4m
 
 define Device/unbranded_wr512-3gn-8m
-  DTS := WR512-3GN-8M
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Ralink
   DEVICE_MODEL := WR512-3GN
   DEVICE_VARIANT := 8M
@@ -1061,7 +1061,7 @@ endef
 TARGET_DEVICES += unbranded_wr512-3gn-8m
 
 define Device/accton_wr6202
-  DTS := WR6202
+  MTK_SOC := rt3052
   DEVICE_VENDOR := Accton
   DEVICE_MODEL := WR6202
   SUPPORTED_DEVICES += wr6202
@@ -1069,7 +1069,7 @@ endef
 TARGET_DEVICES += accton_wr6202
 
 define Device/nexx_wt1520-4m
-  DTS := WT1520-4M
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -1082,7 +1082,7 @@ endef
 TARGET_DEVICES += nexx_wt1520-4m
 
 define Device/nexx_wt1520-8m
-  DTS := WT1520-8M
+  MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
@@ -1094,7 +1094,7 @@ endef
 TARGET_DEVICES += nexx_wt1520-8m
 
 define Device/poray_x5
-  DTS := X5
+  MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
@@ -1106,7 +1106,7 @@ endef
 TARGET_DEVICES += poray_x5
 
 define Device/poray_x8
-  DTS := X8
+  MTK_SOC := rt5350
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
@@ -1118,7 +1118,7 @@ endef
 TARGET_DEVICES += poray_x8
 
 define Device/unbranded_xdx-rn502j
-  DTS := XDXRN502J
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := XDX
@@ -1128,7 +1128,7 @@ endef
 TARGET_DEVICES += unbranded_xdx-rn502j
 
 define Device/zyxel_keenetic
-  DTS := kn
+  MTK_SOC := rt3052
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := ZyXEL
@@ -1139,7 +1139,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic
 
 define Device/zyxel_keenetic-start
-  DTS := kn_st
+  MTK_SOC := rt5350
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Start
@@ -1147,7 +1147,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-start
 
 define Device/zorlik_zl5900v2
-  DTS := ZL5900V2
+  MTK_SOC := rt5350
   DEVICE_VENDOR := Zorlik
   DEVICE_MODEL := ZL5900V2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev