ramips: fix MTK_SOC for RT3662 devices

rt3883.mk contains both RT3662 and RT3883 device profiles, but commit
6a104ac77206 set MTK_SOC to rt3883 for all devices. This patch fixes it,
and renames dts files accordingly. And SoC compatible strings are also
appended in the dts.

Fixes: 6a104ac77206 ("ramips/rt288x,rt3883: Name DTS files based on scheme")
Signed-off-by: Sungbo Eo <mans0n@gorani.run>

diff --git a/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
similarity index 97%
rename from target/linux/ramips/dts/rt3883_asus_rt-n56u.dts
rename to target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
index 9c2a32a9888febf152fd28f3649f1e172caed991..13f6cdd1ddff7677a7d343db2f77b864f76c5295 100644 (file)
--- a/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts
+++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "asus,rt-n56u", "ralink,rt3883-soc";
+       compatible = "asus,rt-n56u", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "Asus RT-N56U";
 
        aliases {

diff --git a/target/linux/ramips/dts/rt3883_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
similarity index 96%
rename from target/linux/ramips/dts/rt3883_dlink_dir-645.dts
rename to target/linux/ramips/dts/rt3662_dlink_dir-645.dts
index 35d011ebba4fbdeacc61f9e81c7bd843d42d6a23..5effbf9fa2601a41413aea98a9193c12a00e8f63 100644 (file)
--- a/target/linux/ramips/dts/rt3883_dlink_dir-645.dts
+++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "dlink,dir-645", "ralink,rt3883-soc";
+       compatible = "dlink,dir-645", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "D-Link DIR-645";
 
        aliases {

diff --git a/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
similarity index 97%
rename from target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts
rename to target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
index f7fb8b5c40e90ca6cced5a96a6ff6124ce8a4e92..9e6d98f95a2fba3ea575ce387af23875476ed071 100644 (file)
--- a/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts
+++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "edimax,br-6475nd", "ralink,rt3883-soc";
+       compatible = "edimax,br-6475nd", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "Edimax BR-6475nD";
 
        aliases {

diff --git a/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts b/target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts
similarity index 92%
rename from target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts
rename to target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts
index 8cce0d5f386f2ee4f346245e6cc975757af3e588..af5ffda28e7b510e569ffd5e0292af3d6b22d5c8 100644 (file)
--- a/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts
+++ b/target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts
@@ -3,7 +3,7 @@
 #include "rt3883.dtsi"
 
 / {
-       compatible = "loewe,wmdr-143n", "ralink,rt3883-soc";
+       compatible = "loewe,wmdr-143n", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "Loewe WMDR-143N";
 };
 

diff --git a/target/linux/ramips/dts/rt3883_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts
similarity index 97%
rename from target/linux/ramips/dts/rt3883_omnima_hpm.dts
rename to target/linux/ramips/dts/rt3662_omnima_hpm.dts
index 7ccd0781444681d2859b8a4aa623919fb9f8c34b..5d3f3278a5866d14cf12fe55dbcd22eb9aeedf58 100644 (file)
--- a/target/linux/ramips/dts/rt3883_omnima_hpm.dts
+++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "omnima,hpm", "ralink,rt3883-soc";
+       compatible = "omnima,hpm", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "Omnima HPM";
 
        aliases {

diff --git a/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
similarity index 96%
rename from target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts
rename to target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
index afffee2bd465204e04cd90bbecbace943eb9eefb..a25d9d02c198e9eb3724c6b08a98180b41b70171 100644 (file)
--- a/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts
+++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "samsung,cy-swr1100", "ralink,rt3883-soc";
+       compatible = "samsung,cy-swr1100", "ralink,rt3662-soc", "ralink,rt3883-soc";
        model = "Samsung CY-SWR1100";
 
        aliases {

diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk
index b0243bfe814e23d23270ceccbbd400cba7d3d78c..8fc778c86445bbd24aca40531da98ea07e25077e 100644 (file)
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@@ -6,7 +6,7 @@ define Build/mkrtn56uimg
 endef
 
 define Device/asus_rt-n56u
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7872k
   IMAGE/sysupgrade.bin += | mkrtn56uimg -s
@@ -33,7 +33,7 @@ TARGET_DEVICES += belkin_f9k1109v1
 
 define Device/dlink_dir-645
   $(Device/seama)
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7872k
   KERNEL := $(KERNEL_DTB)
@@ -46,7 +46,7 @@ endef
 TARGET_DEVICES += dlink_dir-645
 
 define Device/edimax_br-6475nd
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -60,7 +60,7 @@ endef
 TARGET_DEVICES += edimax_br-6475nd
 
 define Device/loewe_wmdr-143n
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7872k
   DEVICE_VENDOR := Loewe
@@ -70,7 +70,7 @@ endef
 TARGET_DEVICES += loewe_wmdr-143n
 
 define Device/omnima_hpm
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 64k
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Omnima
@@ -82,7 +82,7 @@ TARGET_DEVICES += omnima_hpm
 
 define Device/samsung_cy-swr1100
   $(Device/seama)
-  MTK_SOC := rt3883
+  MTK_SOC := rt3662
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7872k
   KERNEL := $(KERNEL_DTB)