[PATCH 1/2] ARM: i.MX8MP: tqma8mpxl: fix eMMC barebox update handler

[PATCH 1/2] ARM: i.MX8MP: tqma8mpxl: fix eMMC barebox update handler

[Ahmad Fatoum]

While the eMMC is indeed uSDHC3, the board's device tree aliases shuffle
around the order, so the eMMC is at mmc0 and the SD is at mmc1.

We thus need to follow suit in the board code as to register the correct
device with the eMMC barebox update handler.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/boards/tqma8mpxl/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/tqma8mpxl/board.c b/arch/arm/boards/tqma8mpxl/board.c
index 39d1bd24d497..16ba1eb1c61c 100644
--- a/arch/arm/boards/tqma8mpxl/board.c
+++ b/arch/arm/boards/tqma8mpxl/board.c
@@ -29,7 +29,7 @@ static int tqma8mpxl_probe(struct device *dev)
 	}
 
 	imx8m_bbu_internal_mmc_register_handler("SD", "/dev/mmc1.barebox", sd_bbu_flag);
-	imx8m_bbu_internal_mmcboot_register_handler("eMMC", "/dev/mmc2", emmc_bbu_flag);
+	imx8m_bbu_internal_mmcboot_register_handler("eMMC", "/dev/mmc0", emmc_bbu_flag);
 
 	return 0;
 }
-- 
2.39.2

[PATCH 2/2] ARM: i.MX8MP: tqma8mpxl: match board code against SoM compatible

[Ahmad Fatoum]

The board code has nothing baseboard-specific: It just registers the
barebox update handler and activates the environment on the bootsource,
both of which are applicable to any boards using the same SoM.

Therefore, let's replace the board matches with a match on the SoM.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/boards/tqma8mpxl/board.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boards/tqma8mpxl/board.c b/arch/arm/boards/tqma8mpxl/board.c
index 16ba1eb1c61c..8b67acb91c55 100644
--- a/arch/arm/boards/tqma8mpxl/board.c
+++ b/arch/arm/boards/tqma8mpxl/board.c
@@ -35,8 +35,7 @@ static int tqma8mpxl_probe(struct device *dev)
 }
 
 static const struct of_device_id tqma8mpxl_of_match[] = {
-	{ .compatible = "tq,imx8mp-tqma8mpdl-mba8mpxl"},
-	{ .compatible = "tq,imx8mp-tqma8mpql-mba8mpxl"},
+	{ .compatible = "tq,imx8mp-tqma8mpql" },
 	{ /* sentinel */ },
 };
 BAREBOX_DEEP_PROBE_ENABLE(tqma8mpxl_of_match);
-- 
2.39.2

Re: (subset) [PATCH 2/2] ARM: i.MX8MP: tqma8mpxl: match board code against SoM compatible

[Sascha Hauer]

On Mon, 29 Jul 2024 16:33:47 +0200, Ahmad Fatoum wrote:
> The board code has nothing baseboard-specific: It just registers the
> barebox update handler and activates the environment on the bootsource,
> both of which are applicable to any boards using the same SoM.
> 
> Therefore, let's replace the board matches with a match on the SoM.
> 
> 
> [...]

Applied, thanks!

[2/2] ARM: i.MX8MP: tqma8mpxl: match board code against SoM compatible
      https://git.pengutronix.de/cgit/barebox/commit/?id=9f3f4af8cf56 (link may not be stable)

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

Re: (subset) [PATCH 1/2] ARM: i.MX8MP: tqma8mpxl: fix eMMC barebox update handler

[Sascha Hauer]

On Mon, 29 Jul 2024 16:33:46 +0200, Ahmad Fatoum wrote:
> While the eMMC is indeed uSDHC3, the board's device tree aliases shuffle
> around the order, so the eMMC is at mmc0 and the SD is at mmc1.
> 
> We thus need to follow suit in the board code as to register the correct
> device with the eMMC barebox update handler.
> 
> 
> [...]

Applied, thanks!

[1/2] ARM: i.MX8MP: tqma8mpxl: fix eMMC barebox update handler
      https://git.pengutronix.de/cgit/barebox/commit/?id=f068a5dbe9f3 (link may not be stable)

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