99 files changed, 104 insertions, 107 deletions
diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts
index 8de4b5877a..8de4b5877a 100644
--- a/target/linux/ramips/dts/AI-BR100.dts
+++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts
diff --git a/target/linux/ramips/dts/AC1200RM.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts
index 388b088d92..388b088d92 100644
--- a/target/linux/ramips/dts/AC1200RM.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts
diff --git a/target/linux/ramips/dts/TUBE-E4G.dts b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
index 4097dc6140..4097dc6140 100644
--- a/target/linux/ramips/dts/TUBE-E4G.dts
+++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts
diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
index 2d2820ed79..2d2820ed79 100644
--- a/target/linux/ramips/dts/RP-N53.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts
diff --git a/target/linux/ramips/dts/RT-AC51U.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
index 3e54ffdad2..3e54ffdad2 100644
--- a/target/linux/ramips/dts/RT-AC51U.dts
+++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts
diff --git a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
index e71d14c6ab..e71d14c6ab 100644
--- a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
+++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts
index 9a6ca335a8..9a6ca335a8 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts
index 8a79d6ab05..8a79d6ab05 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts
index f4b5661eac..f4b5661eac 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts
diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
index 0644378ba2..0644378ba2 100644
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts
diff --git a/target/linux/ramips/dts/DIR-510L.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
index 885e64f9f2..885e64f9f2 100644
--- a/target/linux/ramips/dts/DIR-510L.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
index d728449a48..d728449a48 100644
--- a/target/linux/ramips/dts/DIR-810L.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
diff --git a/target/linux/ramips/dts/DWR-118-A1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
index 707bc1c3d3..707bc1c3d3 100644
--- a/target/linux/ramips/dts/DWR-118-A1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
diff --git a/target/linux/ramips/dts/DWR-118-A2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
index 26b23aa6d1..26b23aa6d1 100644
--- a/target/linux/ramips/dts/DWR-118-A2.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts
index e36af1dc7f..e36af1dc7f 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts
diff --git a/target/linux/ramips/dts/BR-6478AC-V2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
index 5c90aa1549..5c90aa1549 100644
--- a/target/linux/ramips/dts/BR-6478AC-V2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
diff --git a/target/linux/ramips/dts/EW-7476RPC.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts
index 0f35ee0f3c..eb326ccbd8 100644
--- a/target/linux/ramips/dts/EW-7476RPC.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 
-#include "EW-747x.dtsi"
+#include "mt7620a_edimax_ew-747x.dtsi"
 
 / {
 	compatible = "edimax,ew-7476rpc", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/EW-7478AC.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts
index ba33405e65..37caeba23e 100644
--- a/target/linux/ramips/dts/EW-7478AC.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts
@@ -2,7 +2,7 @@
 
 /dts-v1/;
 
-#include "EW-747x.dtsi"
+#include "mt7620a_edimax_ew-747x.dtsi"
 
 / {
 	compatible = "edimax,ew-7478ac", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/EW-7478APC.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts
index bd1768b34e..bd1768b34e 100644
--- a/target/linux/ramips/dts/EW-7478APC.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts
diff --git a/target/linux/ramips/dts/EW-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
index b7d8087d5a..b7d8087d5a 100644
--- a/target/linux/ramips/dts/EW-747x.dtsi
+++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
index 2cea9d9beb..2cea9d9beb 100644
--- a/target/linux/ramips/dts/GL-MT300A.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts
diff --git a/target/linux/ramips/dts/GL-MT300N.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
index a30792cace..a30792cace 100644
--- a/target/linux/ramips/dts/GL-MT300N.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts
diff --git a/target/linux/ramips/dts/GL-MT750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
index 11133a126a..11133a126a 100644
--- a/target/linux/ramips/dts/GL-MT750.dts
+++ b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts
diff --git a/target/linux/ramips/dts/HDRM200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts
index ad16d02716..ad16d02716 100644
--- a/target/linux/ramips/dts/HDRM200.dts
+++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts
diff --git a/target/linux/ramips/dts/HC5661.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts
index 091483a131..185e045de1 100644
--- a/target/linux/ramips/dts/HC5661.dts
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "HC5X61.dtsi"
+#include "mt7620a_hiwifi_hc5x61.dtsi"
 
 / {
 	compatible = "hiwifi,hc5661", "hiwifi,hc5x61", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/HC5761.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts
index dff129a938..265f7d9bb1 100644
--- a/target/linux/ramips/dts/HC5761.dts
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "HC5X61.dtsi"
+#include "mt7620a_hiwifi_hc5x61.dtsi"
 
 / {
 	compatible = "hiwifi,hc5761", "hiwifi,hc5x61", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
index b1d5ce4fa1..73f1a4079a 100644
--- a/target/linux/ramips/dts/HC5861.dts
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "HC5X61.dtsi"
+#include "mt7620a_hiwifi_hc5x61.dtsi"
 
 / {
 	compatible = "hiwifi,hc5861", "hiwifi,hc5x61", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/HC5X61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
index 09b303fd33..09b303fd33 100644
--- a/target/linux/ramips/dts/HC5X61.dtsi
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
diff --git a/target/linux/ramips/dts/C108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts
index 2d89d34ad5..2d89d34ad5 100644
--- a/target/linux/ramips/dts/C108.dts
+++ b/target/linux/ramips/dts/mt7620a_hnet_c108.dts
diff --git a/target/linux/ramips/dts/WN-AC1167GR.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
index 14c851a3a8..14c851a3a8 100644
--- a/target/linux/ramips/dts/WN-AC1167GR.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
diff --git a/target/linux/ramips/dts/WN-AC733GR3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
index ea837c4d34..ea837c4d34 100644
--- a/target/linux/ramips/dts/WN-AC733GR3.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
diff --git a/target/linux/ramips/dts/U25AWF-H1.dts b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts
index 4b4d0b6356..4b4d0b6356 100644
--- a/target/linux/ramips/dts/U25AWF-H1.dts
+++ b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts
diff --git a/target/linux/ramips/dts/LR-25G001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
index 20974c93e2..20974c93e2 100644
--- a/target/linux/ramips/dts/LR-25G001.dts
+++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
diff --git a/target/linux/ramips/dts/Y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
index 87eb1bf4c5..47505b0984 100644
--- a/target/linux/ramips/dts/Y1.dts
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "Y1.dtsi"
+#include "mt7620a_lenovo_newifi-y1.dtsi"
 
 / {
 	compatible = "lenovo,newifi-y1", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi
index 5d6c9922fd..5d6c9922fd 100644
--- a/target/linux/ramips/dts/Y1.dtsi
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi
diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts
index 6cdf0b5cdc..ccb0d18ead 100644
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "Y1.dtsi"
+#include "mt7620a_lenovo_newifi-y1.dtsi"
 
 / {
 	compatible = "lenovo,newifi-y1s", "lenovo,newifi-y1", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts
index 2ea7400a71..2ea7400a71 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts
diff --git a/target/linux/ramips/dts/MicroWRT.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
index a010a9c626..a010a9c626 100644
--- a/target/linux/ramips/dts/MicroWRT.dts
+++ b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts
diff --git a/target/linux/ramips/dts/EX2700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
index 7d7b2220f7..7d7b2220f7 100644
--- a/target/linux/ramips/dts/EX2700.dts
+++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
diff --git a/target/linux/ramips/dts/EX3700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts
index d971909b29..d971909b29 100644
--- a/target/linux/ramips/dts/EX3700.dts
+++ b/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts
diff --git a/target/linux/ramips/dts/WN3000RPV3.dts b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts
index b067a4e448..cc339da5e2 100644
--- a/target/linux/ramips/dts/WN3000RPV3.dts
+++ b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts
@@ -9,7 +9,7 @@
 
 / {
 	compatible = "netgear,wn3000rp-v3", "ralink,mt7620a-soc";
-	model = "Netgear WN3000RPv3";
+	model = "Netgear WN3000RP v3";
 
 	aliases {
 		led-boot = &led_power_green;
diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
index 6b93b8d089..6b93b8d089 100644
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts
diff --git a/target/linux/ramips/dts/K2G.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
index 4ca5229745..4ca5229745 100644
--- a/target/linux/ramips/dts/K2G.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
diff --git a/target/linux/ramips/dts/PSG1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
index 564b083f82..564b083f82 100644
--- a/target/linux/ramips/dts/PSG1208.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts
diff --git a/target/linux/ramips/dts/PSG1218.dtsi b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
index 33eabb6f78..33eabb6f78 100644
--- a/target/linux/ramips/dts/PSG1218.dtsi
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
diff --git a/target/linux/ramips/dts/PSG1218A.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
index 2ae8871d89..dbde2a8047 100644
--- a/target/linux/ramips/dts/PSG1218A.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "PSG1218.dtsi"
+#include "mt7620a_phicomm_psg1218.dtsi"
 
 / {
 	compatible = "phicomm,psg1218a", "phicomm,psg1218", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/PSG1218B.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
index f6445e8c44..0f38b4fc57 100644
--- a/target/linux/ramips/dts/PSG1218B.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "PSG1218.dtsi"
+#include "mt7620a_phicomm_psg1218.dtsi"
 
 / {
 	compatible = "phicomm,psg1218b", "phicomm,psg1218", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/CS-QR10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
index dadd37acba..dadd37acba 100644
--- a/target/linux/ramips/dts/CS-QR10.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts
diff --git a/target/linux/ramips/dts/DB-WRT01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts
index bb2c14e096..bb2c14e096 100644
--- a/target/linux/ramips/dts/DB-WRT01.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts
diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts
index a4a6c9b8be..a4a6c9b8be 100644
--- a/target/linux/ramips/dts/MZK-750DHP.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts
diff --git a/target/linux/ramips/dts/MZK-EX300NP.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
index 6578d952c0..6578d952c0 100644
--- a/target/linux/ramips/dts/MZK-EX300NP.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts
diff --git a/target/linux/ramips/dts/MZK-EX750NP.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts
index 497693d393..497693d393 100644
--- a/target/linux/ramips/dts/MZK-EX750NP.dts
+++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts
diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts
index c9d3d76729..c9d3d76729 100644
--- a/target/linux/ramips/dts/MT7620a.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts
diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts
index 976e2acca3..976e2acca3 100644
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts
diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts
index a2864de94f..a2864de94f 100644
--- a/target/linux/ramips/dts/MT7620a_MT7610e.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7610e-evb.dts
diff --git a/target/linux/ramips/dts/MT7620a_V22SG.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts
index 33d23f2201..33d23f2201 100644
--- a/target/linux/ramips/dts/MT7620a_V22SG.dts
+++ b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts
diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts
index 2110959ee8..2110959ee8 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts
diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts
index 6d85914265..6d85914265 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts
diff --git a/target/linux/ramips/dts/ArcherC2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
index e20b873569..e20b873569 100644
--- a/target/linux/ramips/dts/ArcherC2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
diff --git a/target/linux/ramips/dts/ArcherC20v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
index 602cc70e02..602cc70e02 100644
--- a/target/linux/ramips/dts/ArcherC20v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
index 7dfaddeee4..7dfaddeee4 100644
--- a/target/linux/ramips/dts/ArcherC20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
diff --git a/target/linux/ramips/dts/ArcherC50.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
index b1e13bebea..b1e13bebea 100644
--- a/target/linux/ramips/dts/ArcherC50.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts
index 566b2431fc..566b2431fc 100644
--- a/target/linux/ramips/dts/ArcherMR200.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts
diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts
index e8ff02f2ab..e8ff02f2ab 100644
--- a/target/linux/ramips/dts/MIWIFI-MINI.dts
+++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts
diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
index 5d90b17a04..5d90b17a04 100644
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts
diff --git a/target/linux/ramips/dts/BOCCO.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts
index cc9c6688dc..cc9c6688dc 100644
--- a/target/linux/ramips/dts/BOCCO.dts
+++ b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts
diff --git a/target/linux/ramips/dts/WE1026-5G-16M.dts b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts
index 8954006ece..e2eb5b6329 100644
--- a/target/linux/ramips/dts/WE1026-5G-16M.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts
@@ -33,7 +33,7 @@
 
 /dts-v1/;
 
-#include "WE1026-5G.dtsi"
+#include "mt7620a_zbtlink_we1026-5g.dtsi"
 
 / {
 	compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/WE1026-5G.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi
index e7e64e251a..e7e64e251a 100644
--- a/target/linux/ramips/dts/WE1026-5G.dtsi
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi
diff --git a/target/linux/ramips/dts/ZBT-APE522II.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts
index 70ad0f0b58..70ad0f0b58 100644
--- a/target/linux/ramips/dts/ZBT-APE522II.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts
diff --git a/target/linux/ramips/dts/ZBT-WE826-16M.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts
index c33a11ecb7..7f2b2646b2 100644
--- a/target/linux/ramips/dts/ZBT-WE826-16M.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ZBT-WE826.dtsi"
+#include "mt7620a_zbtlink_zbt-we826.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-we826-16m", "zbtlink,zbt-we826", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/ZBT-WE826-32M.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts
index 9c8f3708d1..e7cdcab5e9 100644
--- a/target/linux/ramips/dts/ZBT-WE826-32M.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "ZBT-WE826.dtsi"
+#include "mt7620a_zbtlink_zbt-we826.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-we826-32m", "zbtlink,zbt-we826", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/ZBT-WE826-E.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts
index ce97b03715..243126125b 100644
--- a/target/linux/ramips/dts/ZBT-WE826-E.dts
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "ZBT-WE826.dtsi"
+#include "mt7620a_zbtlink_zbt-we826.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-we826-e", "zbtlink,zbt-we826", "ralink,mt7620a-soc";
diff --git a/target/linux/ramips/dts/ZBT-WE826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi
index 0776ea7a79..0776ea7a79 100644
--- a/target/linux/ramips/dts/ZBT-WE826.dtsi
+++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi
diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts
index 5b4c5ee047..5b4c5ee047 100644
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts
diff --git a/target/linux/ramips/dts/kng_rc.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
index 3d6d2c6f06..3d6d2c6f06 100644
--- a/target/linux/ramips/dts/kng_rc.dts
+++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts
index 83a7b6adf0..83a7b6adf0 100644
--- a/target/linux/ramips/dts/RT-N12-PLUS.dts
+++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts
diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts
index 834eb0ddf3..834eb0ddf3 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts
diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts
index f0f1cc1337..f0f1cc1337 100644
--- a/target/linux/ramips/dts/WMR-300.dts
+++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts
diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
index 65f44e43d7..65f44e43d7 100644
--- a/target/linux/ramips/dts/CF-WR800N.dts
+++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
diff --git a/target/linux/ramips/dts/DWR-116-A1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts
index 6f76a64039..6f76a64039 100644
--- a/target/linux/ramips/dts/DWR-116-A1.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts
diff --git a/target/linux/ramips/dts/DWR-921-C1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts
index 92bcd54a42..92bcd54a42 100644
--- a/target/linux/ramips/dts/DWR-921-C1.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts
diff --git a/target/linux/ramips/dts/DWR-922-E2.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts
index c2dd26a09d..c2dd26a09d 100644
--- a/target/linux/ramips/dts/DWR-922-E2.dts
+++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts
diff --git a/target/linux/ramips/dts/WRH-300CR.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
index eb6dbe6d1a..eb6dbe6d1a 100644
--- a/target/linux/ramips/dts/WRH-300CR.dts
+++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts
diff --git a/target/linux/ramips/dts/U35WF.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts
index d058b83949..d058b83949 100644
--- a/target/linux/ramips/dts/U35WF.dts
+++ b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts
index 815370e6fd..815370e6fd 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts
index f88af71896..f88af71896 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts
diff --git a/target/linux/ramips/dts/WT3020-4M.dts b/target/linux/ramips/dts/mt7620n_nexx_wt3020-4m.dts
index 4bdc3bd6ba..412c259329 100644
--- a/target/linux/ramips/dts/WT3020-4M.dts
+++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020-4m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WT3020.dtsi"
+#include "mt7620n_nexx_wt3020.dtsi"
 
 / {
 	compatible = "nexx,wt3020-4m", "nexx,wt3020", "ralink,mt7620n-soc";
diff --git a/target/linux/ramips/dts/WT3020-8M.dts b/target/linux/ramips/dts/mt7620n_nexx_wt3020-8m.dts
index be429f0c2b..9569703a36 100644
--- a/target/linux/ramips/dts/WT3020-8M.dts
+++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020-8m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WT3020.dtsi"
+#include "mt7620n_nexx_wt3020.dtsi"
 
 / {
 	compatible = "nexx,wt3020-8m", "nexx,wt3020", "ralink,mt7620n-soc";
diff --git a/target/linux/ramips/dts/WT3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi
index 59558a2e96..59558a2e96 100644
--- a/target/linux/ramips/dts/WT3020.dtsi
+++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi
diff --git a/target/linux/ramips/dts/WD03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts
index bbb2ca3dc9..bbb2ca3dc9 100644
--- a/target/linux/ramips/dts/WD03.dts
+++ b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts
diff --git a/target/linux/ramips/dts/VAR11N-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts
index cf4b7c54a1..cf4b7c54a1 100644
--- a/target/linux/ramips/dts/VAR11N-300.dts
+++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts
diff --git a/target/linux/ramips/dts/WRTNODE.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
index a808818201..a808818201 100644
--- a/target/linux/ramips/dts/WRTNODE.dts
+++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
diff --git a/target/linux/ramips/dts/ZBT-CPE102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts
index 6f0213bf70..6f0213bf70 100644
--- a/target/linux/ramips/dts/ZBT-CPE102.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts
diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts
index 21b56dcae1..21b56dcae1 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts
diff --git a/target/linux/ramips/dts/ZBT-WE2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts
index be8d13be90..be8d13be90 100644
--- a/target/linux/ramips/dts/ZBT-WE2026.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts
index 5292c70dbb..5292c70dbb 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts
diff --git a/target/linux/ramips/dts/kn_rf.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
index 765629548c..765629548c 100644
--- a/target/linux/ramips/dts/kn_rf.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
diff --git a/target/linux/ramips/dts/kn_rc.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts
index 74396d1fc2..74396d1fc2 100644
--- a/target/linux/ramips/dts/kn_rc.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index f53f7dfe67..05d87b52ee 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -36,7 +36,7 @@ define Build/elx-header
 endef
 
 define Device/aigale_ai-br100
-  DTS := AI-BR100
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 7936k
   DEVICE_VENDOR := Aigale
   DEVICE_MODEL := Ai-BR100
@@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += aigale_ai-br100
 
 define Device/alfa-network_ac1200rm
-  DTS := AC1200RM
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := ALFA Network
   DEVICE_MODEL := AC1200RM
@@ -55,7 +55,7 @@ endef
 TARGET_DEVICES += alfa-network_ac1200rm
 
 define Device/alfa-network_tube-e4g
-  DTS := TUBE-E4G
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := ALFA Network
   DEVICE_MODEL := Tube-E4G
@@ -74,6 +74,7 @@ define Device/amit_jboot
 endef
 
 define Device/Archer
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := TP-Link
   TPLINK_HWREVADD := 0
   TPLINK_HVERSION := 3
@@ -85,7 +86,6 @@ endef
 
 define Device/tplink_archer-c20i
   $(Device/Archer)
-  DTS := ArcherC20i
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc2000001
   TPLINK_HWREV := 58
@@ -99,7 +99,6 @@ TARGET_DEVICES += tplink_archer-c20i
 
 define Device/tplink_archer-c50-v1
   $(Device/Archer)
-  DTS := ArcherC50
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc7500001
   TPLINK_HWREV := 69
@@ -115,7 +114,6 @@ TARGET_DEVICES += tplink_archer-c50-v1
 
 define Device/tplink_archer-mr200
   $(Device/Archer)
-  DTS := ArcherMR200
   TPLINK_FLASHLAYOUT := 8MLmtk
   TPLINK_HWID := 0xd7500001
   TPLINK_HWREV := 0x4a
@@ -126,7 +124,7 @@ endef
 TARGET_DEVICES += tplink_archer-mr200
 
 define Device/bdcom_wap2100-sk
-  DTS := BDCOM-WAP2100-SK
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 15808k
   DEVICE_VENDOR := BDCOM
   DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130)
@@ -135,7 +133,7 @@ endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
 define Device/yukai_bocco
-  DTS := BOCCO
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := YUKAI Engineering
   DEVICE_MODEL := BOCCO
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
@@ -144,7 +142,7 @@ endef
 TARGET_DEVICES += yukai_bocco
 
 define Device/hnet_c108
-  DTS := C108
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16777216
   DEVICE_VENDOR := HNET
   DEVICE_MODEL := C108
@@ -154,7 +152,7 @@ endef
 TARGET_DEVICES += hnet_c108
 
 define Device/comfast_cf-wr800n
-  DTS := CF-WR800N
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Comfast
   DEVICE_MODEL := CF-WR800N
   SUPPORTED_DEVICES += cf-wr800n
@@ -162,7 +160,7 @@ endef
 TARGET_DEVICES += comfast_cf-wr800n
 
 define Device/planex_cs-qr10
-  DTS := CS-QR10
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := CS-QR10
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
@@ -173,7 +171,7 @@ endef
 TARGET_DEVICES += planex_cs-qr10
 
 define Device/sanlinking_d240
-  DTS := D240
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Sanlinking Technologies
   DEVICE_MODEL := D240
@@ -183,7 +181,7 @@ endef
 TARGET_DEVICES += sanlinking_d240
 
 define Device/planex_db-wrt01
-  DTS := DB-WRT01
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := DB-WRT01
   SUPPORTED_DEVICES += db-wrt01
@@ -192,7 +190,7 @@ TARGET_DEVICES += planex_db-wrt01
 
 define Device/dlink_dch-m225
   $(Device/seama)
-  DTS := DCH-M225
+  MTK_SOC := mt7620a
   BLOCKSIZE := 4k
   SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b
   IMAGE_SIZE := 6848k
@@ -204,7 +202,7 @@ endef
 TARGET_DEVICES += dlink_dch-m225
 
 define Device/dlink_dir-810l
-  DTS := DIR-810L
+  MTK_SOC := mt7620a
   DEVICE_PACKAGES := kmod-mt76x0e
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-810L
@@ -215,7 +213,7 @@ TARGET_DEVICES += dlink_dir-810l
 
 define Device/dlink_dir-510l
   $(Device/amit_jboot)
-  DTS := DIR-510L
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-510L
   DEVICE_PACKAGES += kmod-mt76x0e
@@ -228,7 +226,7 @@ TARGET_DEVICES += dlink_dir-510l
 
 define Device/dlink_dwr-116-a1
   $(Device/amit_jboot)
-  DTS := DWR-116-A1
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-116
   DEVICE_VARIANT := A1/A2
@@ -240,7 +238,7 @@ TARGET_DEVICES += dlink_dwr-116-a1
 
 define Device/dlink_dwr-118-a1
   $(Device/amit_jboot)
-  DTS := DWR-118-A1
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-118
   DEVICE_VARIANT := A1
@@ -253,7 +251,7 @@ TARGET_DEVICES += dlink_dwr-118-a1
 
 define Device/dlink_dwr-118-a2
   $(Device/amit_jboot)
-  DTS := DWR-118-A2
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-118
   DEVICE_VARIANT := A2
@@ -266,7 +264,7 @@ TARGET_DEVICES += dlink_dwr-118-a2
 
 define Device/dlink_dwr-921-c1
   $(Device/amit_jboot)
-  DTS := DWR-921-C1
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-921
@@ -280,6 +278,7 @@ TARGET_DEVICES += dlink_dwr-921-c1
 
 define Device/dlink_dwr-921-c3
   $(Device/dlink_dwr-921-c1)
+  DEVICE_DTS := mt7620n_dlink_dwr-921-c1
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-921
   DEVICE_VARIANT := C3
@@ -290,7 +289,7 @@ TARGET_DEVICES += dlink_dwr-921-c3
 
 define Device/dlink_dwr-922-e2
   $(Device/amit_jboot)
-  DTS := DWR-922-E2
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-922
@@ -303,7 +302,7 @@ endef
 TARGET_DEVICES += dlink_dwr-922-e2
 
 define Device/linksys_e1700
-  DTS := E1700
+  MTK_SOC := mt7620a
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x013326
@@ -314,9 +313,9 @@ endef
 TARGET_DEVICES += linksys_e1700
 
 define Device/netgear_ex2700
+  MTK_SOC := mt7620a
   NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
   NETGEAR_BOARD_ID := EX2700
-  DTS := EX2700
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -330,8 +329,8 @@ endef
 TARGET_DEVICES += netgear_ex2700
 
 define Device/netgear_ex3700
+  MTK_SOC := mt7620a
   NETGEAR_BOARD_ID := U12H319T00_NETGEAR
-  DTS := EX3700
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGES += factory.chk
@@ -344,7 +343,7 @@ endef
 TARGET_DEVICES += netgear_ex3700
 
 define Device/glinet_gl-mt300a
-  DTS := GL-MT300A
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT300A
@@ -354,7 +353,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300a
 
 define Device/kimax_u25awf-h1
-  DTS := U25AWF-H1
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Kimax
   DEVICE_MODEL := U25AWF
@@ -365,7 +364,7 @@ endef
 TARGET_DEVICES += kimax_u25awf-h1
 
 define Device/glinet_gl-mt300n
-  DTS := GL-MT300N
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT300N
@@ -375,7 +374,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300n
 
 define Device/glinet_gl-mt750
-  DTS := GL-MT750
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT750
@@ -385,7 +384,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt750
 
 define Device/hiwifi_hc5661
-  DTS := HC5661
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5661
@@ -395,7 +394,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5661
 
 define Device/hiwifi_hc5761
-  DTS := HC5761
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5761
@@ -405,7 +404,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5761
 
 define Device/hiwifi_hc5861
-  DTS := HC5861
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5861
@@ -415,7 +414,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5861
 
 define Device/head-weblink_hdrm200
-  DTS := HDRM200
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Head Weblink
   DEVICE_MODEL := HDRM2000
@@ -425,7 +424,7 @@ endef
 TARGET_DEVICES += head-weblink_hdrm200
 
 define Device/iodata_wn-ac1167gr
-  DTS := WN-AC1167GR
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AC1167GR
   IMAGE_SIZE := 6864k
@@ -438,7 +437,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac1167gr
 
 define Device/iodata_wn-ac733gr3
-  DTS := WN-AC733GR3
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := I-O DATA
   DEVICE_MODEL := WN-AC733GR3
   IMAGE_SIZE := 6992k
@@ -451,7 +450,7 @@ endef
 TARGET_DEVICES += iodata_wn-ac733gr3
 
 define Device/kimax_u35wf
-  DTS := U35WF
+  MTK_SOC := mt7620n
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Kimax
   DEVICE_MODEL := U35WF
@@ -460,7 +459,7 @@ endef
 TARGET_DEVICES += kimax_u35wf
 
 define Device/zyxel_keenetic-viva
-  DTS := kng_rc
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Viva
@@ -473,7 +472,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-viva
 
 define Device/zyxel_keenetic-omni
-  DTS := kn_rc
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -485,7 +484,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-omni
 
 define Device/zyxel_keenetic-omni-ii
-  DTS := kn_rf
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni II
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -497,7 +496,7 @@ endef
 TARGET_DEVICES += zyxel_keenetic-omni-ii
 
 define Device/microduino_microwrt
-  DTS := MicroWRT
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16128k
   DEVICE_VENDOR := Microduino
   DEVICE_MODEL := MicroWRT
@@ -508,7 +507,7 @@ TARGET_DEVICES += microduino_microwrt
 
 define Device/lava_lr-25g001
   $(Device/amit_jboot)
-  DTS := LR-25G001
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := LAVA
   DEVICE_MODEL := LR-25G001
   DLINK_ROM_ID := LVA6E3804001
@@ -519,7 +518,7 @@ endef
 TARGET_DEVICES += lava_lr-25g001
 
 define Device/xiaomi_miwifi-mini
-  DTS := MIWIFI-MINI
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := MiWiFi Mini
@@ -529,7 +528,7 @@ endef
 TARGET_DEVICES += xiaomi_miwifi-mini
 
 define Device/kingston_mlw221
-  DTS := MLW221
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Kingston
   DEVICE_MODEL := MLW221
@@ -539,7 +538,7 @@ endef
 TARGET_DEVICES += kingston_mlw221
 
 define Device/kingston_mlwg2
-  DTS := MLWG2
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Kingston
   DEVICE_MODEL := MLWG2
@@ -549,14 +548,14 @@ endef
 TARGET_DEVICES += kingston_mlwg2
 
 define Device/ralink_mt7620a-evb
-  DTS := MT7620a
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a EVB
 endef
 TARGET_DEVICES += ralink_mt7620a-evb
 
 define Device/ralink_mt7620a-mt7530-evb
-  DTS := MT7620a_MT7530
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7530 EVB
   SUPPORTED_DEVICES += mt7620a_mt7530
@@ -564,7 +563,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-mt7530-evb
 
 define Device/ralink_mt7620a-mt7610e-evb
-  DTS := MT7620a_MT7610e
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7610e EVB
   DEVICE_PACKAGES := kmod-mt76x0e
@@ -573,7 +572,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-mt7610e-evb
 
 define Device/ralink_mt7620a-v22sg-evb
-  DTS := MT7620a_V22SG
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a V22SG
   SUPPORTED_DEVICES += mt7620a_v22sg
@@ -581,7 +580,7 @@ endef
 TARGET_DEVICES += ralink_mt7620a-v22sg-evb
 
 define Device/planex_mzk-750dhp
-  DTS := MZK-750DHP
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-750DHP
   DEVICE_PACKAGES := kmod-mt76x0e
@@ -590,7 +589,7 @@ endef
 TARGET_DEVICES += planex_mzk-750dhp
 
 define Device/planex_mzk-ex300np
-  DTS := MZK-EX300NP
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-EX300NP
   SUPPORTED_DEVICES += mzk-ex300np
@@ -598,7 +597,7 @@ endef
 TARGET_DEVICES += planex_mzk-ex300np
 
 define Device/planex_mzk-ex750np
-  DTS := MZK-EX750NP
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-EX750NP
   DEVICE_PACKAGES := kmod-mt76x2
@@ -607,7 +606,7 @@ endef
 TARGET_DEVICES += planex_mzk-ex750np
 
 define Device/sercomm_na930
-  DTS := NA930
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 20m
   DEVICE_VENDOR := Sercomm
   DEVICE_MODEL := NA930
@@ -617,7 +616,7 @@ endef
 TARGET_DEVICES += sercomm_na930
 
 define Device/ohyeah_oy-0001
-  DTS := OY-0001
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Oh Yeah
   DEVICE_MODEL := OY-0001
@@ -627,7 +626,7 @@ endef
 TARGET_DEVICES += ohyeah_oy-0001
 
 define Device/phicomm_psg1208
-  DTS := PSG1208
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1208
   DEVICE_PACKAGES := kmod-mt76x2
@@ -636,7 +635,7 @@ endef
 TARGET_DEVICES += phicomm_psg1208
 
 define Device/phicomm_psg1218a
-  DTS := PSG1218A
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT:= Ax
@@ -646,7 +645,7 @@ endef
 TARGET_DEVICES += phicomm_psg1218a
 
 define Device/phicomm_psg1218b
-  DTS := PSG1218B
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT := Bx
@@ -656,7 +655,7 @@ endef
 TARGET_DEVICES += phicomm_psg1218b
 
 define Device/phicomm_k2g
-  DTS := K2G
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 7552k
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := K2G
@@ -665,7 +664,7 @@ endef
 TARGET_DEVICES += phicomm_k2g
 
 define Device/asus_rp-n53
-  DTS := RP-N53
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RP-N53
   DEVICE_PACKAGES := kmod-rt2800-pci
@@ -674,7 +673,7 @@ endef
 TARGET_DEVICES += asus_rp-n53
 
 define Device/asus_rt-n12p
-  DTS := RT-N12-PLUS
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
   SUPPORTED_DEVICES += rt-n12p
@@ -682,7 +681,7 @@ endef
 TARGET_DEVICES += asus_rt-n12p
 
 define Device/asus_rt-n14u
-  DTS := RT-N14U
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N14u
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -691,7 +690,7 @@ endef
 TARGET_DEVICES += asus_rt-n14u
 
 define Device/asus_rt-ac51u
-  DTS := RT-AC51U
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-AC51U
@@ -701,7 +700,7 @@ endef
 TARGET_DEVICES += asus_rt-ac51u
 
 define Device/dovado_tiny-ac
-  DTS := TINY-AC
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Dovado
   DEVICE_MODEL := Tiny AC
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
@@ -710,7 +709,7 @@ endef
 TARGET_DEVICES += dovado_tiny-ac
 
 define Device/edimax_br-6478ac-v2
-  DTS := BR-6478AC-V2
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := BR-6478AC
   DEVICE_VARIANT := V2
@@ -724,7 +723,7 @@ endef
 TARGET_DEVICES += edimax_br-6478ac-v2
 
 define Device/edimax_ew-7476rpc
-  DTS := EW-7476RPC
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := EW-7476RPC
   BLOCKSIZE := 4k
@@ -737,7 +736,7 @@ endef
 TARGET_DEVICES += edimax_ew-7476rpc
 
 define Device/edimax_ew-7478ac
-  DTS := EW-7478AC
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := EW-7478AC
   BLOCKSIZE := 4k
@@ -750,7 +749,7 @@ endef
 TARGET_DEVICES += edimax_ew-7478ac
 
 define Device/edimax_ew-7478apc
-  DTS := EW-7478APC
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Edimax
   DEVICE_MODEL := EW-7478APC
   BLOCKSIZE := 4k
@@ -764,7 +763,6 @@ TARGET_DEVICES += edimax_ew-7478apc
 
 define Device/tplink_archer-c2-v1
   $(Device/Archer)
-  DTS := ArcherC2-v1
   SUPPORTED_DEVICES += tplink,c2-v1
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc7500001
@@ -778,7 +776,6 @@ TARGET_DEVICES += tplink_archer-c2-v1
 
 define Device/tplink_archer-c20-v1
   $(Device/Archer)
-  DTS := ArcherC20v1
   SUPPORTED_DEVICES += tplink,c20-v1
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc2000001
@@ -792,7 +789,7 @@ endef
 TARGET_DEVICES += tplink_archer-c20-v1
 
 define Device/vonets_var11n-300
-  DTS := VAR11N-300
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   BLOCKSIZE := 4k
   DEVICE_VENDOR := Vonets
@@ -801,7 +798,7 @@ endef
 TARGET_DEVICES += vonets_var11n-300
 
 define Device/ravpower_wd03
-  DTS := WD03
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := Ravpower
   DEVICE_MODEL := WD03
@@ -810,7 +807,7 @@ endef
 TARGET_DEVICES += ravpower_wd03
 
 define Device/buffalo_whr-1166d
-  DTS := WHR-1166D
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 15040k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-1166D
@@ -820,7 +817,7 @@ endef
 TARGET_DEVICES += buffalo_whr-1166d
 
 define Device/buffalo_whr-300hp2
-  DTS := WHR-300HP2
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 6848k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-300HP2
@@ -829,7 +826,7 @@ endef
 TARGET_DEVICES += buffalo_whr-300hp2
 
 define Device/buffalo_whr-600d
-  DTS := WHR-600D
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 6848k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-600D
@@ -839,7 +836,7 @@ endef
 TARGET_DEVICES += buffalo_whr-600d
 
 define Device/buffalo_wmr-300
-  DTS := WMR-300
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WMR-300
   SUPPORTED_DEVICES += wmr-300
@@ -847,9 +844,9 @@ endef
 TARGET_DEVICES += buffalo_wmr-300
 
 define Device/netgear_wn3000rp-v3
+  MTK_SOC := mt7620a
   NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
   NETGEAR_BOARD_ID := WN3000RPv3
-  DTS := WN3000RPV3
   BLOCKSIZE := 4k
   IMAGES += factory.bin
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
@@ -863,7 +860,7 @@ endef
 TARGET_DEVICES += netgear_wn3000rp-v3
 
 define Device/elecom_wrh-300cr
-  DTS := WRH-300CR
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -876,7 +873,7 @@ endef
 TARGET_DEVICES += elecom_wrh-300cr
 
 define Device/wrtnode_wrtnode
-  DTS := WRTNODE
+  MTK_SOC := mt7620n
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WRTNode
   DEVICE_MODEL := WRTNode
@@ -886,7 +883,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode
 
 define Device/nexx_wt3020-4m
-  DTS := WT3020-4M
+  MTK_SOC := mt7620n
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
@@ -900,7 +897,7 @@ endef
 TARGET_DEVICES += nexx_wt3020-4m
 
 define Device/nexx_wt3020-8m
-  DTS := WT3020-8M
+  MTK_SOC := mt7620n
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 8M
@@ -913,7 +910,7 @@ endef
 TARGET_DEVICES += nexx_wt3020-8m
 
 define Device/lenovo_newifi-y1
-  DTS := Y1
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1
@@ -923,7 +920,7 @@ endef
 TARGET_DEVICES += lenovo_newifi-y1
 
 define Device/lenovo_newifi-y1s
-  DTS := Y1S
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1S
@@ -933,7 +930,7 @@ endef
 TARGET_DEVICES += lenovo_newifi-y1s
 
 define Device/youku_yk1
-  DTS := YOUKU-YK1
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := YOUKU
   DEVICE_MODEL := YK1
@@ -943,7 +940,7 @@ endef
 TARGET_DEVICES += youku_yk1
 
 define Device/zbtlink_we1026-5g-16m
-  DTS := WE1026-5G-16M
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 16777216
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE1026-5G
@@ -954,7 +951,7 @@ endef
 TARGET_DEVICES += zbtlink_we1026-5g-16m
 
 define Device/zbtlink_zbt-ape522ii
-  DTS := ZBT-APE522II
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-APE522II
   DEVICE_PACKAGES := kmod-mt76x2
@@ -963,7 +960,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-ape522ii
 
 define Device/zbtlink_zbt-cpe102
-  DTS := ZBT-CPE102
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-CPE102
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -972,7 +969,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-cpe102
 
 define Device/zbtlink_zbt-wa05
-  DTS := ZBT-WA05
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WA05
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -981,7 +978,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wa05
 
 define Device/zbtlink_zbt-we2026
-  DTS := ZBT-WE2026
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE2026
   SUPPORTED_DEVICES += zbt-we2026
@@ -989,7 +986,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we2026
 
 define Device/zbtlink_zbt-we826-16m
-  DTS := ZBT-WE826-16M
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
@@ -1000,7 +997,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-16m
 
 define Device/zbtlink_zbt-we826-32m
-  DTS := ZBT-WE826-32M
+  MTK_SOC := mt7620a
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
@@ -1011,7 +1008,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-32m
 
 define Device/zbtlink_zbt-we826-e
-  DTS := ZBT-WE826-E
+  MTK_SOC := mt7620a
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826-E
@@ -1021,7 +1018,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we826-e
 
 define Device/zbtlink_zbt-wr8305rt
-  DTS := ZBT-WR8305RT
+  MTK_SOC := mt7620n
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WR8305RT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -1030,7 +1027,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wr8305rt
 
 define Device/zte_q7
-  DTS := ZTE-Q7
+  MTK_SOC := mt7620a
   DEVICE_VENDOR := ZTE
   DEVICE_MODEL := Q7
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci