| Message ID | 20230914194709.2516651-1-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: imx6ull/7d-colibri: Fix compatible | expand |
Hi Fabio Thanks for looking into this and sorry about the confusion. On Thu, 2023-09-14 at 16:47 -0300, Fabio Estevam wrote: > From: Fabio Estevam <festevam@denx.de> > > Fix the imx6ull/7d-colibri devicetrees as per the rules defined > at fsl.yaml. > > Signed-off-by: Fabio Estevam <festevam@denx.de> With further below mentioned issue about imx6ull-colibri-emmc-iris-v2.dts fixed: Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > Hi, > > I am assuming that fsl.yaml is correct and that the devicetree files > are the ones that should be fixed. Yes. Please note that both the Colibri iMX7 Dual 1GB (eMMC) as well as the Colibri iMX6ULL 1GB IT (eMMC) were a mere marketing afterthought. In theory, they are all just different Colibri iMX7 and Colibri iMX6ULL SKUs with more or less cores, RAM, with or without Wi-Fi, IT or non-IT and with either raw NAND flash or eMMC. However, some such differences are handled more transparently than others (e.g. without specific device trees and compatibles) while others require a specific device tree and compatible. One misconception in the past was that "toradex,colibri-imx6ull" could mean any Colibri iMX6ULL SKU so basically the whole family of modules but that does not really work as historically "toradex,colibri-imx6ull" already means the raw NAND based variant. So it is correct to only have one of either "toradex,colibri-imx6ull", "toradex,colibri-imx6ull-emmc", or "toradex,colibri-imx6ull-wifi". And in the Colibri iMX7 case either "toradex,colibri-imx7d", "toradex,colibri- imx7d-emmc", or "toradex,colibri-imx7s". > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts | 1 - > arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts | 1 - > 13 files changed, 5 insertions(+), 13 deletions(-) > > 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 919c0464d6cb..b2cdf4877718 100644 > --- 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 61b93cb040c7..2dc16c54fc78 100644 > --- 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 b9060c2f7977..6088ee0a029a 100644 > --- 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 > @@ -11,7 +11,6 @@ > / { > model = "Toradex Colibri iMX6ULL 1G (eMMC) on Colibri Iris V2"; > compatible = "toradex,colibri-imx6ull-iris-v2", Here it seems rather this is wrong and should have -emmc in its compatible as well. > - "toradex,colibri-imx6ull-emmc", So this one would actually be correct. > "toradex,colibri-imx6ull", But that is wrong and should be gone. > "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 0ab71f2f5daa..0b1603ff9420 100644 > --- 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 d6da984e518d..c5bc255b21e1 100644 > --- 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 c7da5b41966f..d3bbd05da293 100644 > --- 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 917f5dbe64ba..0ac306c9cef2 100644 > --- 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 488da6df56fa..38cd52c45496 100644 > --- 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 e63253254754..5f60df64f173 100644 > --- 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 d9c7045a55ba..212e0685585d 100644 > --- 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 96b599439dde..1deece7e7129 100644 > --- 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 5eccb837b158..22e7863c2e80 100644 > --- 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 ae10e8a66ff1..a3cf8f50e3dc 100644 > --- 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"; > }; Cheers Marcel
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 919c0464d6cb..b2cdf4877718 100644 --- 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 61b93cb040c7..2dc16c54fc78 100644 --- 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 b9060c2f7977..6088ee0a029a 100644 --- 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 @@ -11,7 +11,6 @@ / { model = "Toradex Colibri iMX6ULL 1G (eMMC) on Colibri Iris V2"; compatible = "toradex,colibri-imx6ull-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 0ab71f2f5daa..0b1603ff9420 100644 --- 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 d6da984e518d..c5bc255b21e1 100644 --- 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 c7da5b41966f..d3bbd05da293 100644 --- 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 917f5dbe64ba..0ac306c9cef2 100644 --- 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 488da6df56fa..38cd52c45496 100644 --- 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 e63253254754..5f60df64f173 100644 --- 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 d9c7045a55ba..212e0685585d 100644 --- 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 96b599439dde..1deece7e7129 100644 --- 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 5eccb837b158..22e7863c2e80 100644 --- 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 ae10e8a66ff1..a3cf8f50e3dc 100644 --- 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"; };