Add bootph- props to emmc, sdmmc, uart and related pinctrl nodes to ensure devices and pinctrl can be used in xPL and U-Boot pre-reloc.
Remove the explicit bootph-all prop from the pinctrl node, any bootph- prop will automatically be propagated to the pinctrl node.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- arch/arm/dts/rk3288-miqi-u-boot.dtsi | 57 +++++++++++++++++++++++++++- configs/miqi-rk3288_defconfig | 2 +- 2 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/rk3288-miqi-u-boot.dtsi b/arch/arm/dts/rk3288-miqi-u-boot.dtsi index 721d02086939..05e07425c751 100644 --- a/arch/arm/dts/rk3288-miqi-u-boot.dtsi +++ b/arch/arm/dts/rk3288-miqi-u-boot.dtsi @@ -17,27 +17,75 @@ };
&emmc { + bootph-pre-ram; + bootph-some-ram; +}; + +&emmc_bus8 { + bootph-pre-ram; + bootph-some-ram; +}; + +&emmc_clk { + bootph-pre-ram; + bootph-some-ram; +}; + +&emmc_cmd { + bootph-pre-ram; + bootph-some-ram; +}; + +&emmc_pwr { + bootph-pre-ram; + bootph-some-ram; +}; + +&gpio7 { + /delete-property/ bootph-all; +}; + +&pcfg_pull_none { bootph-all; };
-&pinctrl { +&pcfg_pull_none_12ma { + bootph-pre-ram; + bootph-some-ram; +}; + +&pcfg_pull_up { bootph-all; };
+&pcfg_pull_up_drv_12ma { + bootph-pre-ram; + bootph-some-ram; +}; + &sdmmc { - bootph-all; + bootph-pre-ram; + bootph-some-ram; };
&sdmmc_bus4 { bootph-pre-ram; + bootph-some-ram; +}; + +&sdmmc_cd { + bootph-pre-ram; + bootph-some-ram; };
&sdmmc_clk { bootph-pre-ram; + bootph-some-ram; };
&sdmmc_cmd { bootph-pre-ram; + bootph-some-ram; };
&sdmmc_pwr { @@ -47,3 +95,8 @@ &uart2 { bootph-all; }; + +&uart2_xfer { + bootph-pre-sram; + bootph-pre-ram; +}; diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 2bb8bf2ac060..0e3c2b38f22b 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -37,7 +37,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y