From 204a62c64c0b432728f11c79cadc9f6446d79d47 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Sat, 19 Oct 2024 08:51:25 +0800 Subject: [PATCH] arm: dts: imx8qm-mek: fix boot serial_init runs into panic because no serial device found. Update the device tree to include bootph-some-ram for some critial devices needed in pre-reloc stage Also update usdhc related properties to avoid card initialization failure. Fixes: 8c103c33fb1 ("dm: dts: Convert driver model tags to use new schema") Signed-off-by: Peng Fan --- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 33 +++++++++++++++++++++++++ arch/arm/dts/fsl-imx8qm-mek.dts | 1 - 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi index 6e5379e53c..38925d5306 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi @@ -7,18 +7,48 @@ &{/imx8qm-pm} { + bootph-some-ram; bootph-pre-ram; }; &mu { + bootph-some-ram; bootph-pre-ram; }; &clk { + bootph-some-ram; bootph-pre-ram; }; &iomuxc { + bootph-some-ram; + bootph-pre-ram; +}; + +®_usdhc2_vmmc { + bootph-pre-ram; +}; + +&{/mu@5d1c0000/iomuxc/imx8qm-mek} { + bootph-some-ram; + bootph-pre-ram; +}; + +&pinctrl_usdhc2_gpio { + bootph-pre-ram; +}; + +&pinctrl_usdhc2 { + bootph-pre-ram; +}; + +&pinctrl_lpuart0 { + bootph-some-ram; + bootph-pre-ram; +}; + +&pinctrl_usdhc1 { bootph-pre-ram; }; @@ -75,10 +105,12 @@ }; &pd_dma { + bootph-some-ram; bootph-pre-ram; }; &pd_dma_lpuart0 { + bootph-some-ram; bootph-pre-ram; }; @@ -131,6 +163,7 @@ }; &lpuart0 { + bootph-some-ram; bootph-pre-ram; }; diff --git a/arch/arm/dts/fsl-imx8qm-mek.dts b/arch/arm/dts/fsl-imx8qm-mek.dts index 63908ba6bf..6cf7ce3d5e 100644 --- a/arch/arm/dts/fsl-imx8qm-mek.dts +++ b/arch/arm/dts/fsl-imx8qm-mek.dts @@ -6,7 +6,6 @@ /dts-v1/; #include "fsl-imx8qm.dtsi" -#include "fsl-imx8qm-mek-u-boot.dtsi" / { model = "Freescale i.MX8QM MEK"; -- 2.39.5