ARM: dts: imx6ull/7d-colibri: Fix compatible

Fix the imx6ull/7d-colibri devicetrees as per the rules defined
at fsl.yaml.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts
index 919c0464d6cb58ce00cc9256f8d4eafe93560786..b2cdf4877718ada4e1ab29db9f24eee6c095aca4 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts
@@ -12,6 +12,5 @@
        model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Aster";
        compatible = "toradex,colibri-imx6ull-emmc-aster",
                     "toradex,colibri-imx6ull-emmc",
-                    "toradex,colibri-imx6ull",
                     "fsl,imx6ull";
 };

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts
index 61b93cb040c7fbdbacbaff73f352659560c0c1d6..2dc16c54fc788c1a0435a197c3c691914999f39c 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts
@@ -12,6 +12,5 @@
        model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Evaluation Board V3";
        compatible = "toradex,colibri-imx6ull-emmc-eval",
                     "toradex,colibri-imx6ull-emmc",
-                    "toradex,colibri-imx6ull",
                     "fsl,imx6ull";
 };

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts
index b9060c2f7977e3adbdcc56f4d4bfe3e2aeb6116c..9bae08fb7f8580ffad77a109bd5a27f6cf608201 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts
@@ -10,8 +10,7 @@
 
 / {
        model = "Toradex Colibri iMX6ULL 1G (eMMC) on Colibri Iris V2";
-       compatible = "toradex,colibri-imx6ull-iris-v2",
+       compatible = "toradex,colibri-imx6ull-emmc-iris-v2",
                     "toradex,colibri-imx6ull-emmc",
-                    "toradex,colibri-imx6ull",
                     "fsl,imx6ull";
 };

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts
index 0ab71f2f5daa4235092e95893e59a2d6ba227c39..0b1603ff94201446a6ef8e9414fb6f524813fe0d 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts
@@ -12,6 +12,5 @@
        model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Iris";
        compatible = "toradex,colibri-imx6ull-emmc-iris",
                     "toradex,colibri-imx6ull-emmc",
-                    "toradex,colibri-imx6ull",
                     "fsl,imx6ull";
 };

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts
index d6da984e518d42d3c6c8937e76bbd902f63f7c25..c5bc255b21e1bb6e521c6af23eda21598637b135 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts
@@ -10,7 +10,7 @@
 
 / {
        model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3";
-       compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull";
+       compatible = "toradex,colibri-imx6ull-eval", "toradex,colibri-imx6ull", "fsl,imx6ull";
 };
 
 &ad7879_ts {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts
index c7da5b41966fa94f7e1a3eb61789a5dd27ba76e1..d3bbd05da293101e154f05892fd0509cad90bf22 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts
@@ -11,7 +11,7 @@
 / {
        model = "Toradex Colibri iMX6ULL 512MB on Colibri Aster";
        compatible = "toradex,colibri-imx6ull-wifi-aster",
-                    "toradex,colibri-imx6ull",
+                    "toradex,colibri-imx6ull-wifi",
                     "fsl,imx6ull";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts
index 917f5dbe64ba37fd1007d47f9a47fc038794e21e..0ac306c9cef2780d22401ba8b7d282473a1bddd4 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts
@@ -10,7 +10,7 @@
 
 / {
        model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3";
-       compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull";
+       compatible = "toradex,colibri-imx6ull-wifi-eval", "toradex,colibri-imx6ull-wifi", "fsl,imx6ull";
 };
 
 &ad7879_ts {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts
index 488da6df56fa128d2a945e35d0ee76c078579e68..38cd52c454961b2b76e3b6088a67f0880d25b62f 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts
@@ -11,7 +11,7 @@
 / {
        model = "Toradex Colibri iMX6ULL 512MB on Colibri Iris V2";
        compatible = "toradex,colibri-imx6ull-wifi-iris-v2",
-                    "toradex,colibri-imx6ull",
+                    "toradex,colibri-imx6ull-wifi",
                     "fsl,imx6ull";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts
index e632532547545228198ecafb933b59175b9a1731..5f60df64f173bc99d386c5dc12432c7b30455b21 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts
@@ -11,7 +11,7 @@
 / {
        model = "Toradex Colibri iMX6ULL 512MB on Colibri Iris";
        compatible = "toradex,colibri-imx6ull-wifi-iris",
-                    "toradex,colibri-imx6ull",
+                    "toradex,colibri-imx6ull-wifi",
                     "fsl,imx6ull";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts
index d9c7045a55ba5989d2060f43eeafb9a328fee1f9..212e0685585d52294cf599bdc80816d6d34f1a84 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts
@@ -12,7 +12,6 @@
        model = "Toradex Colibri iMX7D 1GB (eMMC) on Aster Carrier Board";
        compatible = "toradex,colibri-imx7d-emmc-aster",
                     "toradex,colibri-imx7d-emmc",
-                    "toradex,colibri-imx7d",
                     "fsl,imx7d";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts
index 96b599439dded490674db354e09c98f44345fc00..1deece7e7129dff688f7754164b173ced045a579 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts
@@ -11,7 +11,6 @@
        model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Evaluation Board V3";
        compatible = "toradex,colibri-imx7d-emmc-eval-v3",
                     "toradex,colibri-imx7d-emmc",
-                    "toradex,colibri-imx7d",
                     "fsl,imx7d";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts
index 5eccb837b15841899b713e4e452c75e7afbc656f..22e7863c2e80d53ebbef306735014d81b5fc5979 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts
@@ -11,7 +11,6 @@
        model = "Toradex Colibri iMX7D 1GB on Iris V2 Carrier Board";
        compatible = "toradex,colibri-imx7d-emmc-iris-v2",
                     "toradex,colibri-imx7d-emmc",
-                    "toradex,colibri-imx7d",
                     "fsl,imx7d";
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts
index ae10e8a66ff1932198793f7bbd2664642b8c7697..a3cf8f50e3dc073a72d24ce99f75478566c6f0e5 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts
@@ -11,7 +11,6 @@
        model = "Toradex Colibri iMX7D 1GB on Iris Carrier Board";
        compatible = "toradex,colibri-imx7d-emmc-iris",
                     "toradex,colibri-imx7d-emmc",
-                    "toradex,colibri-imx7d",
                     "fsl,imx7d";
 };