[PATCH 2/2] mmc: rockchip_sdhci: Enable by default for all supported SoCs

[Quentin Schulz]

Hi Chen-Yu,

On 4/29/25 5:44 PM, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <wens at csie.org>
> 
> The rockchip_sdhci driver supports the alternative MMC controller found
> in newer Rockchip SoCs. This controller is used for eMMC. Almost all
> defconfigs for Rockchip platforms with this controller have it enabled.
> 
> Enable it by default for all supported Rockchip SoCs. Disable it
> explicitly in defconfigs that previously didn't have it enabled.
> 

Same remark as patch 1, maybe only keep changes that wouldn't be covered 
by a simple make savedefconfig after your patch?

[...]

> diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig
> index 5dc72ebd82a7..e90390f6daff 100644
> --- a/configs/orangepi-5-rk3588s_defconfig
> +++ b/configs/orangepi-5-rk3588s_defconfig
> @@ -54,6 +54,7 @@ CONFIG_ROCKCHIP_GPIO=y
>   CONFIG_SYS_I2C_ROCKCHIP=y
>   CONFIG_MISC=y
>   CONFIG_SUPPORT_EMMC_RPMB=y
> +# CONFIG_MMC_SDHCI is not set
>   CONFIG_SPI_FLASH_SFDP_SUPPORT=y
>   CONFIG_SPI_FLASH_XMC=y
>   CONFIG_PHY_MOTORCOMM=y

[...]

Seems like the OrangePi 5B has sdhci enabled, but we don't support it in 
U-Boot (yet), so fine :)

> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index f2f0e7dbe601..94377a1a1419 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -481,6 +481,11 @@ config MMC_SANDBOX
>   
>   config MMC_SDHCI
>   	bool "Secure Digital Host Controller Interface support"
> +	default y if ROCKCHIP_RK3399
> +	default y if ROCKCHIP_RK3528
> +	default y if ROCKCHIP_RK3568
> +	default y if ROCKCHIP_RK3576
> +	default y if ROCKCHIP_RK3588
>   	help
>   	  This selects the generic Secure Digital Host Controller Interface.
>   	  It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
> @@ -713,6 +718,7 @@ config MMC_SDHCI_ROCKCHIP
>   	bool "Arasan SDHCI controller for Rockchip support"
>   	depends on ARCH_ROCKCHIP
>   	depends on MMC_SDHCI
> +	default y

I guess this is fine compared to patch 1 because of the depends on 
ARCH_ROCKCHIP.