55 files changed, 55 insertions, 66 deletions
diff --git a/target/linux/ramips/dts/AWUSFREE1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
index 4e5ce1cc7b..4e5ce1cc7b 100644
--- a/target/linux/ramips/dts/AWUSFREE1.dts
+++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
diff --git a/target/linux/ramips/dts/WCR-1166DS.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
index 602ea8c5de..602ea8c5de 100644
--- a/target/linux/ramips/dts/WCR-1166DS.dts
+++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
diff --git a/target/linux/ramips/dts/WR1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index ff0b9badd1..ff0b9badd1 100644
--- a/target/linux/ramips/dts/WR1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
index 6d98a4492f..6d98a4492f 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
diff --git a/target/linux/ramips/dts/DUZUN-DM06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
index 7325e2c699..7325e2c699 100644
--- a/target/linux/ramips/dts/DUZUN-DM06.dts
+++ b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
index e4220736d2..e4220736d2 100644
--- a/target/linux/ramips/dts/GL-MT300N-V2.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
diff --git a/target/linux/ramips/dts/VIXMINI.dts b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts
index 5a52fe2a1b..5a52fe2a1b 100644
--- a/target/linux/ramips/dts/VIXMINI.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts
diff --git a/target/linux/ramips/dts/HLK-7628N.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
index 71c6b60ac2..71c6b60ac2 100644
--- a/target/linux/ramips/dts/HLK-7628N.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
diff --git a/target/linux/ramips/dts/HC5661A.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
index 25f1ff1a02..25f1ff1a02 100644
--- a/target/linux/ramips/dts/HC5661A.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
diff --git a/target/linux/ramips/dts/HC5861B.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
index 5cc2634dcc..5cc2634dcc 100644
--- a/target/linux/ramips/dts/HC5861B.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index eaa75f407d..eaa75f407d 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
diff --git a/target/linux/ramips/dts/MT7628.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
index b4afc8ce96..b4afc8ce96 100644
--- a/target/linux/ramips/dts/MT7628.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
index 7d13621135..7d13621135 100644
--- a/target/linux/ramips/dts/MAC1200RV2.dts
+++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index d263c7824b..d263c7824b 100644
--- a/target/linux/ramips/dts/R6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
diff --git a/target/linux/ramips/dts/OMEGA2.dts b/target/linux/ramips/dts/mt7628an_onion_omega2.dts
index 25cc818d56..00eff076b2 100644
--- a/target/linux/ramips/dts/OMEGA2.dts
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "OMEGA2.dtsi"
+#include "mt7628an_onion_omega2.dtsi"
 
 / {
 	compatible = "onion,omega2", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index e36602d6c9..e36602d6c9 100644
--- a/target/linux/ramips/dts/OMEGA2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
diff --git a/target/linux/ramips/dts/OMEGA2P.dts b/target/linux/ramips/dts/mt7628an_onion_omega2p.dts
index 53e8377292..da500df77a 100644
--- a/target/linux/ramips/dts/OMEGA2P.dts
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2p.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "OMEGA2.dtsi"
+#include "mt7628an_onion_omega2.dtsi"
 
 / {
 	compatible = "onion,omega2p", "onion,omega2", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/RAK633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
index ac7218510f..ac7218510f 100644
--- a/target/linux/ramips/dts/RAK633.dts
+++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
diff --git a/target/linux/ramips/dts/SKW92A.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
index dddb794a8f..dddb794a8f 100644
--- a/target/linux/ramips/dts/SKW92A.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
diff --git a/target/linux/ramips/dts/W06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts
index 55b117c194..55b117c194 100644
--- a/target/linux/ramips/dts/W06.dts
+++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts
diff --git a/target/linux/ramips/dts/TOTOLINK-LR1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
index 81aa8db915..81aa8db915 100644
--- a/target/linux/ramips/dts/TOTOLINK-LR1200.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
diff --git a/target/linux/ramips/dts/TPLINK-8M-SPLIT-UBOOT.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index c62079ee56..c62079ee56 100644
--- a/target/linux/ramips/dts/TPLINK-8M-SPLIT-UBOOT.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
diff --git a/target/linux/ramips/dts/TPLINK-8M.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index 9f7f7ccd6c..9f7f7ccd6c 100644
--- a/target/linux/ramips/dts/TPLINK-8M.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
diff --git a/target/linux/ramips/dts/ArcherC20v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index f207ac0d46..222e4a665e 100644
--- a/target/linux/ramips/dts/ArcherC20v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/target/linux/ramips/dts/ArcherC50V3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index 32cc42ef58..d3d1329647 100644
--- a/target/linux/ramips/dts/ArcherC50V3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/ArcherC50V4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 7d129a5f80..cd8731201d 100644
--- a/target/linux/ramips/dts/ArcherC50V4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "TPLINK-8M-SPLIT-UBOOT.dtsi"
+#include "mt7628an_tplink_8m-split-uboot.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-MR3020V3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
index 7a9ef41446..7a9ef41446 100644
--- a/target/linux/ramips/dts/TL-MR3020V3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
diff --git a/target/linux/ramips/dts/TL-MR3420V5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index a528152d38..9573b86dcc 100644
--- a/target/linux/ramips/dts/TL-MR3420V5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WA801NDV5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index fb944b07ef..684ce32de4 100644
--- a/target/linux/ramips/dts/TL-WA801NDV5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WR802NV4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 668da700c3..6460ede251 100644
--- a/target/linux/ramips/dts/TL-WR802NV4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WR840NV4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 5f5bb4fa47..8d379cffd4 100644
--- a/target/linux/ramips/dts/TL-WR840NV4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WR840NV5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
index 773839098b..773839098b 100644
--- a/target/linux/ramips/dts/TL-WR840NV5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
diff --git a/target/linux/ramips/dts/TL-WR841NV13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index 3dea063286..1af6354d1a 100644
--- a/target/linux/ramips/dts/TL-WR841NV13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WR841NV14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
index 6e12361ec9..6e12361ec9 100644
--- a/target/linux/ramips/dts/TL-WR841NV14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
diff --git a/target/linux/ramips/dts/TL-WR842NV5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index 0610b20250..7b8b258655 100644
--- a/target/linux/ramips/dts/TL-WR842NV5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/TL-WR902ACV3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index 1d634314cf..0e31d41061 100644
--- a/target/linux/ramips/dts/TL-WR902ACV3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "TPLINK-8M.dtsi"
+#include "mt7628an_tplink_8m.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/U7628-01-128M-16M.dts b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-128m-16m.dts
index ac9fd503ca..75a1bd5404 100644
--- a/target/linux/ramips/dts/U7628-01-128M-16M.dts
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-128m-16m.dts
@@ -34,7 +34,7 @@
 
 /dts-v1/;
 
-#include "U7628-01.dtsi"
+#include "mt7628an_unielec_u7628-01.dtsi"
 
 / {
 	compatible = "unielec,u7628-01-128m-16m", "unielec,u7628-01", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/U7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
index 03da1f88f2..03da1f88f2 100644
--- a/target/linux/ramips/dts/U7628-01.dtsi
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
diff --git a/target/linux/ramips/dts/VOCORE2LITE.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
index 20fd148293..fc8fc89b71 100644
--- a/target/linux/ramips/dts/VOCORE2LITE.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VOCORE2.dtsi"
+#include "mt7628an_vocore_vocore2.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
diff --git a/target/linux/ramips/dts/VOCORE2.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
index a78d2cc733..939bb0b761 100644
--- a/target/linux/ramips/dts/VOCORE2.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "VOCORE2.dtsi"
+#include "mt7628an_vocore_vocore2.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
diff --git a/target/linux/ramips/dts/VOCORE2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
index f7aec8e1f5..f7aec8e1f5 100644
--- a/target/linux/ramips/dts/VOCORE2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
diff --git a/target/linux/ramips/dts/WL-WN570HA1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
index a07490b853..a07490b853 100644
--- a/target/linux/ramips/dts/WL-WN570HA1.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
diff --git a/target/linux/ramips/dts/WL-WN575A3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
index 76923d5cf6..76923d5cf6 100644
--- a/target/linux/ramips/dts/WL-WN575A3.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
diff --git a/target/linux/ramips/dts/WIDORA-NEO-16M.dts b/target/linux/ramips/dts/mt7628an_widora_neo-16m.dts
index 9ed6b15334..9aa9e78fb4 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-16M.dts
+++ b/target/linux/ramips/dts/mt7628an_widora_neo-16m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WIDORA-NEO.dtsi"
+#include "mt7628an_widora_neo.dtsi"
 
 / {
 	compatible = "widora,neo-16m", "widora,neo", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/WIDORA-NEO-32M.dts b/target/linux/ramips/dts/mt7628an_widora_neo-32m.dts
index cfd6ba709c..6f67e60bb8 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-32M.dts
+++ b/target/linux/ramips/dts/mt7628an_widora_neo-32m.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WIDORA-NEO.dtsi"
+#include "mt7628an_widora_neo.dtsi"
 
 / {
 	compatible = "widora,neo-32m", "widora,neo", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/WIDORA-NEO.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
index af3a1b1a1e..af3a1b1a1e 100644
--- a/target/linux/ramips/dts/WIDORA-NEO.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
diff --git a/target/linux/ramips/dts/WIZFI630S.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index 13c8f68f15..13c8f68f15 100644
--- a/target/linux/ramips/dts/WIZFI630S.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
diff --git a/target/linux/ramips/dts/WRTNODE2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
index 9bac822872..9bac822872 100644
--- a/target/linux/ramips/dts/WRTNODE2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
diff --git a/target/linux/ramips/dts/WRTNODE2P.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
index cd668d601e..fe9cf0dd1a 100644
--- a/target/linux/ramips/dts/WRTNODE2P.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WRTNODE2.dtsi"
+#include "mt7628an_wrtnode_wrtnode2.dtsi"
 
 / {
 	compatible = "wrtnode,wrtnode2p", "wrtnode,wrtnode2", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/WRTNODE2R.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
index bfe533c0c3..ccee34416b 100644
--- a/target/linux/ramips/dts/WRTNODE2R.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "WRTNODE2.dtsi"
+#include "mt7628an_wrtnode_wrtnode2.dtsi"
 
 / {
 	compatible = "wrtnode,wrtnode2r", "wrtnode,wrtnode2", "mediatek,mt7628an-soc";
diff --git a/target/linux/ramips/dts/XIAOMI-MIR4A-100M.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
index 8a33745f7f..8a33745f7f 100644
--- a/target/linux/ramips/dts/XIAOMI-MIR4A-100M.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
index bad37e21f1..bad37e21f1 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
diff --git a/target/linux/ramips/dts/ZBT-WE1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
index aace0042e4..aace0042e4 100644
--- a/target/linux/ramips/dts/ZBT-WE1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
index 56912a786e..56912a786e 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index b8d118bc69..f5fa21d8ff 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -3,6 +3,7 @@
 #
 
 define Device/tplink
+  MTK_SOC := mt7628an
   DEVICE_VENDOR := TP-Link
   TPLINK_FLASHLAYOUT :=
   TPLINK_HWID :=
@@ -21,7 +22,7 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN
 
 
 define Device/alfa-network_awusfree1
-  DTS := AWUSFREE1
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := ALFA Network
   DEVICE_MODEL := AWUSFREE1
@@ -30,7 +31,7 @@ endef
 TARGET_DEVICES += alfa-network_awusfree1
 
 define Device/cudy_wr1000
-  DTS := WR1000
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -44,7 +45,7 @@ endef
 TARGET_DEVICES += cudy_wr1000
 
 define Device/tama_w06
-  DTS := W06
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 15040k
   DEVICE_VENDOR := Tama
   DEVICE_MODEL := W06
@@ -53,7 +54,7 @@ endef
 TARGET_DEVICES += tama_w06
 
 define Device/duzun_dm06
-  DTS := DUZUN-DM06
+  MTK_SOC := mt7628an
   DEVICE_VENDOR := DuZun
   DEVICE_MODEL := DM06
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
@@ -62,7 +63,7 @@ endef
 TARGET_DEVICES += duzun_dm06
 
 define Device/glinet_gl-mt300n-v2
-  DTS := GL-MT300N-V2
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT300N
@@ -73,7 +74,7 @@ endef
 TARGET_DEVICES += glinet_gl-mt300n-v2
 
 define Device/glinet_vixmini
-  DTS := VIXMINI
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := VIXMINI
@@ -82,7 +83,7 @@ endef
 TARGET_DEVICES += glinet_vixmini
 
 define Device/hiwifi_hc5661a
-  DTS := HC5661A
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5661A
@@ -91,7 +92,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5661a
 
 define Device/hilink_hlk-7628n
-  DTS := HLK-7628N
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := HILINK
   DEVICE_MODEL := HLK-7628N
@@ -99,7 +100,7 @@ endef
 TARGET_DEVICES += hilink_hlk-7628n
 
 define Device/hiwifi_hc5861b
-  DTS := HC5861B
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 15808k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5861B
@@ -108,7 +109,7 @@ endef
 TARGET_DEVICES += hiwifi_hc5861b
 
 define Device/mediatek_linkit-smart-7688
-  DTS := LINKIT7688
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := LinkIt Smart 7688
@@ -118,7 +119,7 @@ endef
 TARGET_DEVICES += mediatek_linkit-smart-7688
 
 define Device/mercury_mac1200r-v2
-  DTS := MAC1200RV2
+  MTK_SOC := mt7628an
   DEVICE_VENDOR := Mercury
   DEVICE_MODEL := MAC1200R
   DEVICE_VARIANT := v2.0
@@ -129,7 +130,7 @@ endef
 TARGET_DEVICES += mercury_mac1200r-v2
 
 define Device/xiaomi_miwifi-nano
-  DTS := MIWIFI-NANO
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := MiWiFi Nano
@@ -139,7 +140,7 @@ endef
 TARGET_DEVICES += xiaomi_miwifi-nano
 
 define Device/mediatek_mt7628an-eval-board
-  DTS := MT7628
+  MTK_SOC := mt7628an
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := MediaTek
@@ -150,7 +151,7 @@ endef
 TARGET_DEVICES += mediatek_mt7628an-eval-board
 
 define Device/netgear_r6120
-  DTS := R6120
+  MTK_SOC := mt7628an
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := NETGEAR
@@ -168,7 +169,7 @@ endef
 TARGET_DEVICES += netgear_r6120
 
 define Device/onion_omega2
-  DTS := OMEGA2
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Onion
   DEVICE_MODEL := Omega2
@@ -178,7 +179,7 @@ endef
 TARGET_DEVICES += onion_omega2
 
 define Device/onion_omega2p
-  DTS := OMEGA2P
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := Onion
   DEVICE_MODEL := Omega2+
@@ -188,7 +189,7 @@ endef
 TARGET_DEVICES += onion_omega2p
 
 define Device/d-team_pbr-d1
-  DTS := PBR-D1
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := PandoraBox
   DEVICE_MODEL := PBR-D1
@@ -198,7 +199,7 @@ endef
 TARGET_DEVICES += d-team_pbr-d1
 
 define Device/rakwireless_rak633
-  DTS := RAK633
+  MTK_SOC := mt7628an
   DEVICE_VENDOR := Rakwireless
   DEVICE_MODEL := RAK633
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
@@ -206,7 +207,7 @@ endef
 TARGET_DEVICES += rakwireless_rak633
 
 define Device/skylab_skw92a
-  DTS := SKW92A
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Skylab
   DEVICE_MODEL := SKW92A
@@ -215,7 +216,7 @@ endef
 TARGET_DEVICES += skylab_skw92a
 
 define Device/totolink_lr1200
-  DTS := TOTOLINK-LR1200
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := TOTOLINK
   DEVICE_MODEL := LR1200
@@ -225,7 +226,6 @@ TARGET_DEVICES += totolink_lr1200
 
 define Device/tplink_tl-wa801nd-v5
   $(Device/tplink)
-  DTS := TL-WA801NDV5
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WA801ND
   DEVICE_VARIANT := v5
@@ -239,7 +239,6 @@ TARGET_DEVICES += tplink_tl-wa801nd-v5
 
 define Device/tplink_tl-wr802n-v4
   $(Device/tplink)
-  DTS := TL-WR802NV4
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WR802N
   DEVICE_VARIANT := v4
@@ -253,7 +252,6 @@ TARGET_DEVICES += tplink_tl-wr802n-v4
 
 define Device/tplink_tl-wr840n-v4
   $(Device/tplink)
-  DTS := TL-WR840NV4
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WR840N
   DEVICE_VARIANT := v4
@@ -267,7 +265,7 @@ endef
 TARGET_DEVICES += tplink_tl-wr840n-v4
 
 define Device/tplink_tl-wr840n-v5
-  DTS := TL-WR840NV5
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 3904k
   DEVICE_MODEL := TL-WR840N
   DEVICE_VARIANT := v5
@@ -286,7 +284,6 @@ TARGET_DEVICES += tplink_tl-wr840n-v5
 
 define Device/tplink_tl-wr841n-v13
   $(Device/tplink)
-  DTS := TL-WR841NV13
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WR841N
   DEVICE_VARIANT := v13
@@ -301,7 +298,6 @@ TARGET_DEVICES += tplink_tl-wr841n-v13
 
 define Device/tplink_tl-wr841n-v14
   $(Device/tplink)
-  DTS := TL-WR841NV14
   IMAGE_SIZE := 3968k
   DEVICE_MODEL := TL-WR841N
   DEVICE_VARIANT := v14
@@ -316,7 +312,6 @@ TARGET_DEVICES += tplink_tl-wr841n-v14
 
 define Device/tplink_archer-c20-v4
   $(Device/tplink)
-  DTS := ArcherC20v4
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C20
   DEVICE_VARIANT := v4
@@ -332,7 +327,6 @@ TARGET_DEVICES += tplink_archer-c20-v4
 
 define Device/tplink_archer-c50-v3
   $(Device/tplink)
-  DTS := ArcherC50V3
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := Archer C50
   DEVICE_VARIANT := v3
@@ -348,7 +342,6 @@ TARGET_DEVICES += tplink_archer-c50-v3
 
 define Device/tplink_archer-c50-v4
   $(Device/tplink)
-  DTS := ArcherC50V4
   IMAGE_SIZE := 7616k
   DEVICE_MODEL := Archer C50
   DEVICE_VARIANT := v4
@@ -365,7 +358,6 @@ TARGET_DEVICES += tplink_archer-c50-v4
 
 define Device/tplink_tl-mr3020-v3
   $(Device/tplink)
-  DTS := TL-MR3020V3
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-MR3020
   DEVICE_VARIANT := v3
@@ -380,7 +372,6 @@ TARGET_DEVICES += tplink_tl-mr3020-v3
 
 define Device/tplink_tl-mr3420-v5
   $(Device/tplink)
-  DTS := TL-MR3420V5
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-MR3420
   DEVICE_VARIANT := v5
@@ -395,7 +386,6 @@ TARGET_DEVICES += tplink_tl-mr3420-v5
 
 define Device/tplink_tl-wr842n-v5
   $(Device/tplink)
-  DTS := TL-WR842NV5
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WR842N
   DEVICE_VARIANT := v5
@@ -410,7 +400,6 @@ TARGET_DEVICES += tplink_tl-wr842n-v5
 
 define Device/tplink_tl-wr902ac-v3
   $(Device/tplink)
-  DTS := TL-WR902ACV3
   IMAGE_SIZE := 7808k
   DEVICE_MODEL := TL-WR902AC
   DEVICE_VARIANT := v3
@@ -424,7 +413,7 @@ endef
 TARGET_DEVICES += tplink_tl-wr902ac-v3
 
 define Device/unielec_u7628-01-128m-16m
-  DTS := U7628-01-128M-16M
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := UniElec
   DEVICE_MODEL := U7628-01
@@ -435,7 +424,7 @@ endef
 TARGET_DEVICES += unielec_u7628-01-128m-16m
 
 define Device/vocore_vocore2
-  DTS := VOCORE2
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore2
@@ -446,7 +435,7 @@ endef
 TARGET_DEVICES += vocore_vocore2
 
 define Device/vocore_vocore2-lite
-  DTS := VOCORE2LITE
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := VoCore
   DEVICE_MODEL := VoCore2-Lite
@@ -457,7 +446,7 @@ endef
 TARGET_DEVICES += vocore_vocore2-lite
 
 define Device/wavlink_wl-wn570ha1
-  DTS := WL-WN570HA1
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := Wavlink
   DEVICE_MODEL := WL-WN570HA1
@@ -466,7 +455,7 @@ endef
 TARGET_DEVICES += wavlink_wl-wn570ha1
 
 define Device/wavlink_wl-wn575a3
-  DTS := WL-WN575A3
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := Wavlink
   DEVICE_MODEL := WL-WN575A3
@@ -476,7 +465,7 @@ endef
 TARGET_DEVICES += wavlink_wl-wn575a3
 
 define Device/buffalo_wcr-1166ds
-  DTS := WCR-1166DS
+  MTK_SOC := mt7628an
   BUFFALO_TAG_PLATFORM := MTK
   BUFFALO_TAG_VERSION := 9.99
   BUFFALO_TAG_MINOR := 9.99
@@ -495,7 +484,7 @@ endef
 TARGET_DEVICES += buffalo_wcr-1166ds
 
 define Device/widora_neo-16m
-  DTS := WIDORA-NEO-16M
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Widora
   DEVICE_MODEL := Widora-NEO
@@ -506,7 +495,7 @@ endef
 TARGET_DEVICES += widora_neo-16m
 
 define Device/widora_neo-32m
-  DTS := WIDORA-NEO-32M
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := Widora
   DEVICE_MODEL := Widora-NEO
@@ -516,7 +505,7 @@ endef
 TARGET_DEVICES += widora_neo-32m
 
 define Device/wiznet_wizfi630s
-  DTS := WIZFI630S
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := WIZnet
   DEVICE_MODEL := WizFi630S
@@ -524,7 +513,7 @@ endef
 TARGET_DEVICES += wiznet_wizfi630s
 
 define Device/wrtnode_wrtnode2p
-  DTS := WRTNODE2P
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WRTnode
   DEVICE_MODEL := WRTnode 2P
@@ -534,7 +523,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode2p
 
 define Device/wrtnode_wrtnode2r
-  DTS := WRTNODE2R
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WRTnode
   DEVICE_MODEL := WRTnode 2R
@@ -544,7 +533,7 @@ endef
 TARGET_DEVICES += wrtnode_wrtnode2r
 
 define Device/xiaomi_mir4a-100m
-  DTS := XIAOMI-MIR4A-100M
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 14976k
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router 4A
@@ -554,7 +543,7 @@ endef
 TARGET_DEVICES += xiaomi_mir4a-100m
 
 define Device/zbtlink_zbt-we1226
-  DTS := ZBT-WE1226
+  MTK_SOC := mt7628an
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_VENDOR := ZBTlink
   DEVICE_MODEL := ZBT-WE1226
@@ -562,7 +551,7 @@ endef
 TARGET_DEVICES += zbtlink_zbt-we1226
 
 define Device/zyxel_keenetic-extra-ii
-  DTS := ki_rb
+  MTK_SOC := mt7628an
   IMAGE_SIZE := 14912k
   BLOCKSIZE := 64k
   DEVICE_VENDOR := ZyXEL