On 6/3/21 11:51 AM, Yangbo Lu wrote:
For eSDHC, power supply is through peripheral circuit. Some eSDHC versions have value 0 of the bit but that does not reflect the truth. 3.3V is common for SD/MMC, and is supported for all boards with eSDHC in current u-boot. So, make 3.3V is supported in default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled if future board does not support 3.3V.
This is also a fix-up for one previous patch, which converted to use IS_ENABLED() for CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 that is not a Kconfig option.
Fixes: 52faec31827e ("mmc: fsl_esdhc: replace most #ifdefs by IS_ENABLED()") Signed-off-by: Yangbo Lu yangbo.lu@nxp.com
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes for v2:
- Updated copyright.
Chagnes for v3:
- Fixed code logic.
drivers/mmc/Kconfig | 7 +++++++ drivers/mmc/fsl_esdhc.c | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 8901456967..0909f502a1 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -798,6 +798,13 @@ config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND This option assumes no hotplug, and u-boot has to make all the way to to linux to use 1.8v UHS-I speed mode if has card.
+config FSL_ESDHC_VS33_NOT_SUPPORT
- bool "3.3V power supply not supported"
- depends on FSL_ESDHC
- help
For eSDHC, power supply is through peripheral circuit. 3.3V support iscommon. Select this if 3.3V power supply not supported.config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" help diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 7501fdb71e..1d98fa65c4 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /*
- Copyright 2007, 2010-2011 Freescale Semiconductor, Inc
- Copyright 2019-2020 NXP
- Copyright 2019-2021 NXP
- Andy Fleming
- Based vaguely on the pxa mmc code:
@@ -795,10 +795,21 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv, u32 caps;
caps = esdhc_read32(®s->hostcapblt);
- /*
* For eSDHC, power supply is through peripheral circuit. Some eSDHC* versions have value 0 of the bit but that does not reflect the* truth. 3.3V is common for SD/MMC, and is supported for all boards* with eSDHC in current u-boot. So, make 3.3V is supported in* default in code. CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT can be enabled* if future board does not support 3.3V.*/- caps |= HOSTCAPBLT_VS33;
- if (IS_ENABLED(CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT))
caps &= ~HOSTCAPBLT_VS33;- if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_ESDHC135)) caps &= ~(HOSTCAPBLT_SRS | HOSTCAPBLT_VS18 | HOSTCAPBLT_VS30);
- if (IS_ENABLED(CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33))
caps |= HOSTCAPBLT_VS33;