On 2024/12/13 06:09, Jonas Karlman wrote:
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
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3288-firefly-u-boot.dtsi | 55 ++++++++++++++++++++++--- configs/firefly-rk3288_defconfig | 2 +- 2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/arch/arm/dts/rk3288-firefly-u-boot.dtsi b/arch/arm/dts/rk3288-firefly-u-boot.dtsi index 8870188e6129..435a02acea5d 100644 --- a/arch/arm/dts/rk3288-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3288-firefly-u-boot.dtsi @@ -26,35 +26,75 @@ };
&emmc {
- bootph-all;
- bootph-pre-ram;
- bootph-some-ram;
+};
+&emmc_bus8 {
- bootph-pre-ram;
- bootph-some-ram;
+};
+&emmc_clk {
- bootph-pre-ram;
- bootph-some-ram; };
-&gpio3 { +&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; };
-&pcfg_pull_up_drv_12ma { +&pcfg_pull_none_12ma { bootph-pre-ram;
- bootph-some-ram; };
-&pinctrl { +&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 {
@@ -64,3 +104,8 @@ &uart2 { bootph-all; };
+&uart2_xfer {
- bootph-pre-sram;
- bootph-pre-ram;
+}; diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 87ed0c0d2aea..862a17c84e07 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -38,7 +38,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