[PATCH] ARM: i.MX: move barebox,bootsource-mmc aliases to chosen node

[PATCH] ARM: i.MX: move barebox,bootsource-mmc aliases to chosen node

[Sascha Hauer]

The barebox,bootsource-* properties are looked for in /chosen, not in
/aliases. Move the properties to the correct node.

Fixes: 7eedf79ba9 ("ARM: i.MX: add barebox,bootsource-mmc aliases")
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx51.dtsi   | 3 +++
 arch/arm/dts/imx53.dtsi   | 3 +++
 arch/arm/dts/imx6qdl.dtsi | 3 +++
 arch/arm/dts/imx8mm.dtsi  | 3 +++
 arch/arm/dts/imx8mn.dtsi  | 3 +++
 arch/arm/dts/imx8mp.dtsi  | 3 +++
 arch/arm/dts/imx8mq.dtsi  | 2 +-
 arch/arm/dts/imx93.dtsi   | 2 +-
 8 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/imx51.dtsi b/arch/arm/dts/imx51.dtsi
index 2be6b955e2..521f182d20 100644
--- a/arch/arm/dts/imx51.dtsi
+++ b/arch/arm/dts/imx51.dtsi
@@ -2,6 +2,9 @@ /{
 	aliases {
 		pwm0 = &pwm1;
 		pwm1 = &pwm2;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &esdhc1;
 		barebox,bootsource-mmc1 = &esdhc2;
 		barebox,bootsource-mmc2 = &esdhc3;
diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi
index 5be1d7a53f..0fd05f9b51 100644
--- a/arch/arm/dts/imx53.dtsi
+++ b/arch/arm/dts/imx53.dtsi
@@ -3,6 +3,9 @@ aliases {
 		pwm0 = &pwm1;
 		pwm1 = &pwm2;
 		ipu0 = &ipu;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &esdhc1;
 		barebox,bootsource-mmc1 = &esdhc2;
 		barebox,bootsource-mmc2 = &esdhc3;
diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
index 5afb772a84..6f58804ed3 100644
--- a/arch/arm/dts/imx6qdl.dtsi
+++ b/arch/arm/dts/imx6qdl.dtsi
@@ -7,6 +7,9 @@ aliases {
 		pwm3 = &pwm4;
 		ipu0 = &ipu1;
 		gpr.reboot_mode = &reboot_mode_gpr;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 		barebox,bootsource-mmc2 = &usdhc3;
diff --git a/arch/arm/dts/imx8mm.dtsi b/arch/arm/dts/imx8mm.dtsi
index d3d0129421..01f74c1074 100644
--- a/arch/arm/dts/imx8mm.dtsi
+++ b/arch/arm/dts/imx8mm.dtsi
@@ -9,6 +9,9 @@ aliases {
 		pwm1 = &pwm2;
 		pwm2 = &pwm3;
 		pwm3 = &pwm4;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 		barebox,bootsource-mmc2 = &usdhc3;
diff --git a/arch/arm/dts/imx8mn.dtsi b/arch/arm/dts/imx8mn.dtsi
index 6f3f943548..9aa787ea25 100644
--- a/arch/arm/dts/imx8mn.dtsi
+++ b/arch/arm/dts/imx8mn.dtsi
@@ -8,6 +8,9 @@ aliases {
 		pwm1 = &pwm2;
 		pwm2 = &pwm3;
 		pwm3 = &pwm4;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 		barebox,bootsource-mmc2 = &usdhc3;
diff --git a/arch/arm/dts/imx8mp.dtsi b/arch/arm/dts/imx8mp.dtsi
index 6c84cfb211..4d1f1bf588 100644
--- a/arch/arm/dts/imx8mp.dtsi
+++ b/arch/arm/dts/imx8mp.dtsi
@@ -14,6 +14,9 @@ aliases {
 		pwm1 = &pwm2;
 		pwm2 = &pwm3;
 		pwm3 = &pwm4;
+	};
+
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 		barebox,bootsource-mmc2 = &usdhc3;
diff --git a/arch/arm/dts/imx8mq.dtsi b/arch/arm/dts/imx8mq.dtsi
index d90afbe628..7cdbafcffe 100644
--- a/arch/arm/dts/imx8mq.dtsi
+++ b/arch/arm/dts/imx8mq.dtsi
@@ -5,7 +5,7 @@
  */
 
 / {
-	aliases {
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 	};
diff --git a/arch/arm/dts/imx93.dtsi b/arch/arm/dts/imx93.dtsi
index dd24c732d3..b931586d74 100644
--- a/arch/arm/dts/imx93.dtsi
+++ b/arch/arm/dts/imx93.dtsi
@@ -1,5 +1,5 @@
 /{
-	aliases {
+	chosen {
 		barebox,bootsource-mmc0 = &usdhc1;
 		barebox,bootsource-mmc1 = &usdhc2;
 		barebox,bootsource-mmc2 = &usdhc3;
-- 
2.39.2

Re: [PATCH] ARM: i.MX: move barebox,bootsource-mmc aliases to chosen node

[Sascha Hauer]

On Mon, 26 Feb 2024 16:31:17 +0100, Sascha Hauer wrote:
> The barebox,bootsource-* properties are looked for in /chosen, not in
> /aliases. Move the properties to the correct node.
> 
> 

Applied, thanks!

[1/1] ARM: i.MX: move barebox,bootsource-mmc aliases to chosen node
      https://git.pengutronix.de/cgit/barebox/commit/?id=0b2848e757ae (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>