smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: rk3288-firefly: Include required DT nodes in xPL

Browse Source 
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>
This commit is contained in:
Jonas Karlman
2024-12-12 22:09:38 +00:00
committed by Tom Rini
parent 14c13f295a
commit 8baa2d8958
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
arch/arm/dts/rk3288-firefly-u-boot.dtsi
View File

@@ -26,35 +26,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;
};
&gpio3 {
&pcfg_pull_none_12ma {
bootph-pre-ram;
bootph-some-ram;
};
&pcfg_pull_up {
bootph-all;
};
&pcfg_pull_up_drv_12ma {
bootph-pre-ram;
};
&pinctrl {
bootph-all;
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;
};

2
configs/firefly-rk3288_defconfig
View File

@@ -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