[PATCH 1/2] ARM: dts: imx6ull-phytec-tauri: Remove board model and compatible

[PATCH 1/2] ARM: dts: imx6ull-phytec-tauri: Remove board model and compatible

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

The imx6ull-phytec-tauri.dtsi file is included in two places:

imx6ull-phytec-tauri-emmc.dts
imx6ull-phytec-tauri-nand.dts

These two files overwrite the board model and compatible locally, so
there is no need for describing them in imx6ull-phytec-tauri.dtsi.

Remove the board model and compatible.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
index ea627638e40c..44cc4ff1d0df 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
@@ -9,11 +9,6 @@
 #include "imx6ull-phytec-phycore-som.dtsi"
 
 / {
-
-	model = "PHYTEC phyGate-Tauri i.MX6 UltraLite";
-	compatible = "phytec,imx6ull-phygate-tauri",
-		     "phytec,imx6ull-pcl063", "fsl,imx6ull";
-
 	aliases {
 		rtc0 = &i2c_rtc;
 		rtc1 = &snvs_rtc;
-- 
2.34.1

[PATCH 2/2] ARM: dts: imx6ull-phytec-tauri: Fix compatible

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Per fsl.yaml, the order of the compatible strings are not correct for
imx6ull-phytec-tauri-emmc and imx6ull-phytec-tauri-nand.

Fix them accordingly.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts | 4 ++--
 arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts
index 14adb87da911..1610f3892d9e 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts
@@ -9,8 +9,8 @@
 
 / {
 	model = "PHYTEC phyGate-Tauri i.MX6 UltraLite";
-	compatible = "phytec,imx6ull-phygate-tauri",
-		     "phytec,imx6ull-phygate-tauri-emmc",
+	compatible = "phytec,imx6ull-phygate-tauri-emmc",
+		     "phytec,imx6ull-phygate-tauri",
 		     "phytec,imx6ull-pcl063", "fsl,imx6ull";
 };
 
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts
index ae396ac63443..92e7d38d5637 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts
@@ -9,8 +9,8 @@
 
 / {
 	model = "PHYTEC phyGate-Tauri i.MX6 UltraLite";
-	compatible = "phytec,imx6ull-phygate-tauri",
-		     "phytec,imx6ull-phygate-tauri-nand",
+	compatible = "phytec,imx6ull-phygate-tauri-nand",
+		     "phytec,imx6ull-phygate-tauri",
 		     "phytec,imx6ull-pcl063", "fsl,imx6ull";
 };
 
-- 
2.34.1

Re: [PATCH 1/2] ARM: dts: imx6ull-phytec-tauri: Remove board model and compatible

[Shawn Guo]

On Thu, Sep 14, 2023 at 04:40:26PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
> 
> The imx6ull-phytec-tauri.dtsi file is included in two places:
> 
> imx6ull-phytec-tauri-emmc.dts
> imx6ull-phytec-tauri-nand.dts
> 
> These two files overwrite the board model and compatible locally, so
> there is no need for describing them in imx6ull-phytec-tauri.dtsi.
> 
> Remove the board model and compatible.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Applied both, thanks!