[PATCH 04/13] rockchip: rk3288-tinker: Drop unused vcc_sd regulator from SPL

[Kever Yang]

On 2024/11/6 00:00, Jonas Karlman wrote:
> The sdmmc power come from vcc33_sd pmic regulator and not from the
> vcc_sd fixed regulator, as currently defined in the in-tree DT.
>
> Drop vcc_sd and the related gpio7 and sdmmc_pwr nodes from being
> included in SPL along with any related Kconfig option. Also enable
> SPL_DM_SEQ_ALIAS to ensure aliases is handled correctly in SPL.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3288-tinker-u-boot.dtsi | 9 ---------
>   configs/tinker-rk3288_defconfig        | 7 +------
>   configs/tinker-s-rk3288_defconfig      | 7 +------
>   3 files changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> index 1665e4f5d10f..4f230739f1c3 100644
> --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> @@ -18,7 +18,6 @@
>   
>   &gpio7 {
>   	/delete-property/ bootph-all;
> -	bootph-pre-ram;
>   };
>   
>   &i2c2 {
> @@ -64,10 +63,6 @@
>   	bootph-pre-ram;
>   };
>   
> -&sdmmc_pwr {
> -	bootph-pre-ram;
> -};
> -
>   &uart2 {
>   	bootph-all;
>   };
> @@ -76,7 +71,3 @@
>   	bootph-pre-sram;
>   	bootph-pre-ram;
>   };
> -
> -&vcc_sd {
> -	bootph-pre-ram;
> -};
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index 42dbef9c2c30..aff820ebfdda 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -4,7 +4,6 @@ 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_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
> @@ -33,8 +32,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
>   CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_SPL_NO_BSS_LIMIT=y
>   # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_I2C=y
> -CONFIG_SPL_POWER=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_I2C=y
> @@ -54,6 +51,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
>   CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>   CONFIG_SYS_MMC_ENV_DEV=1
> +CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_REGMAP=y
>   CONFIG_SPL_REGMAP=y
>   CONFIG_SYSCON=y
> @@ -74,10 +72,7 @@ CONFIG_PINCTRL=y
>   CONFIG_SPL_PINCTRL=y
>   CONFIG_DM_PMIC=y
>   CONFIG_PMIC_RK8XX=y
> -CONFIG_SPL_PMIC_RK8XX=y
> -CONFIG_SPL_DM_REGULATOR=y
>   CONFIG_DM_REGULATOR_FIXED=y
> -CONFIG_SPL_DM_REGULATOR_FIXED=y
>   CONFIG_REGULATOR_RK8XX=y
>   CONFIG_PWM_ROCKCHIP=y
>   CONFIG_RAM=y
> diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
> index e62a03e066cc..6aef775a5717 100644
> --- a/configs/tinker-s-rk3288_defconfig
> +++ b/configs/tinker-s-rk3288_defconfig
> @@ -5,7 +5,6 @@ CONFIG_SYS_ARCH_TIMER=y
>   CONFIG_ARCH_ROCKCHIP=y
>   CONFIG_TEXT_BASE=0x01000000
>   CONFIG_SYS_MALLOC_F_LEN=0x4000
> -CONFIG_SPL_GPIO=y
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
> @@ -33,8 +32,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
>   CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_SPL_NO_BSS_LIMIT=y
>   # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_I2C=y
> -CONFIG_SPL_POWER=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_I2C=y
> @@ -55,6 +52,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
>   CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>   CONFIG_SYS_MMC_ENV_DEV=1
> +CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_REGMAP=y
>   CONFIG_SPL_REGMAP=y
>   CONFIG_SYSCON=y
> @@ -75,10 +73,7 @@ CONFIG_PINCTRL=y
>   CONFIG_SPL_PINCTRL=y
>   CONFIG_DM_PMIC=y
>   CONFIG_PMIC_RK8XX=y
> -CONFIG_SPL_PMIC_RK8XX=y
> -CONFIG_SPL_DM_REGULATOR=y
>   CONFIG_DM_REGULATOR_FIXED=y
> -CONFIG_SPL_DM_REGULATOR_FIXED=y
>   CONFIG_REGULATOR_RK8XX=y
>   CONFIG_PWM_ROCKCHIP=y
>   CONFIG_RAM=y