| Message ID | 20241105215202.1491441-7-jonas@kwiboo.se |
|---|---|
| State | New |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3288-miqi: Migrate to OF_UPSTREAM | expand |
On 2024/11/6 05:51, Jonas Karlman wrote: > Add bootph props and enable related Kconfig options to include the sdmmc > regulator in SPL. Also enable SPL_DM_SEQ_ALIAS to ensure aliases is > handled correctly in SPL. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3288-miqi-u-boot.dtsi | 5 +++++ > configs/miqi-rk3288_defconfig | 3 +++ > 2 files changed, 8 insertions(+) > > diff --git a/arch/arm/dts/rk3288-miqi-u-boot.dtsi b/arch/arm/dts/rk3288-miqi-u-boot.dtsi > index 05e07425c751..4361b35d6c8f 100644 > --- a/arch/arm/dts/rk3288-miqi-u-boot.dtsi > +++ b/arch/arm/dts/rk3288-miqi-u-boot.dtsi > @@ -43,6 +43,7 @@ > > &gpio7 { > /delete-property/ bootph-all; > + bootph-pre-ram; > }; > > &pcfg_pull_none { > @@ -100,3 +101,7 @@ > bootph-pre-sram; > bootph-pre-ram; > }; > + > +&vcc_sd { > + bootph-pre-ram; > +}; > diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig > index 0e3c2b38f22b..87fd256c8a53 100644 > --- a/configs/miqi-rk3288_defconfig > +++ b/configs/miqi-rk3288_defconfig > @@ -4,6 +4,7 @@ CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y > CONFIG_SYS_ARCH_TIMER=y > CONFIG_ARCH_ROCKCHIP=y > CONFIG_TEXT_BASE=0x01000000 > +CONFIG_SPL_GPIO=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_DEFAULT_DEVICE_TREE="rk3288-miqi" > @@ -40,6 +41,7 @@ CONFIG_SPL_OF_CONTROL=y > 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_SPL_DM_SEQ_ALIAS=y > CONFIG_REGMAP=y > CONFIG_SPL_REGMAP=y > CONFIG_SYSCON=y > @@ -62,6 +64,7 @@ CONFIG_DM_PMIC=y > CONFIG_PMIC_ACT8846=y > CONFIG_REGULATOR_ACT8846=y > CONFIG_DM_REGULATOR_FIXED=y > +CONFIG_SPL_DM_REGULATOR_FIXED=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM=y > CONFIG_SPL_RAM=y
diff --git a/arch/arm/dts/rk3288-miqi-u-boot.dtsi b/arch/arm/dts/rk3288-miqi-u-boot.dtsi index 05e07425c751..4361b35d6c8f 100644 --- a/arch/arm/dts/rk3288-miqi-u-boot.dtsi +++ b/arch/arm/dts/rk3288-miqi-u-boot.dtsi @@ -43,6 +43,7 @@ &gpio7 { /delete-property/ bootph-all; + bootph-pre-ram; }; &pcfg_pull_none { @@ -100,3 +101,7 @@ bootph-pre-sram; bootph-pre-ram; }; + +&vcc_sd { + bootph-pre-ram; +}; diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 0e3c2b38f22b..87fd256c8a53 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -4,6 +4,7 @@ CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y CONFIG_TEXT_BASE=0x01000000 +CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miqi" @@ -40,6 +41,7 @@ CONFIG_SPL_OF_CONTROL=y 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_SPL_DM_SEQ_ALIAS=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -62,6 +64,7 @@ CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y
Add bootph props and enable related Kconfig options to include the sdmmc regulator in SPL. Also enable SPL_DM_SEQ_ALIAS to ensure aliases is handled correctly in SPL. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3288-miqi-u-boot.dtsi | 5 +++++ configs/miqi-rk3288_defconfig | 3 +++ 2 files changed, 8 insertions(+)