On 07/01/20 00:11, Fabio Estevam wrote: > When no GPIO is used to read the card detect status the following > error is seen: > > MMC: FSL_SDHC: 0, FSL_SDHC: 1 > > Loading Environment from MMC... MMC: no card present > > *** Warning - No block device, using default environment > > Fix it by handling the "broken-cd" property in the same way > that drivers/mmc/sdhci.c does, which considers that the SD card > is present when the "broken-cd" property is passed. > > Tested on a imx6ul-evk board. > > Signed-off-by: Fabio Estevam <feste...@gmail.com> > --- > drivers/mmc/fsl_esdhc_imx.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c > index f1afab742d..7d465ef76b 100644 > --- a/drivers/mmc/fsl_esdhc_imx.c > +++ b/drivers/mmc/fsl_esdhc_imx.c > @@ -115,6 +115,7 @@ struct esdhc_soc_data { > * Following is used when Driver Model is enabled for MMC > * @dev: pointer for the device > * @non_removable: 0: removable; 1: non-removable > + * @broken_cd: 0: use GPIO for card detect; 1: Do not use GPIO for card > detect > * @wp_enable: 1: enable checking wp; 0: no check > * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V > * @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h > @@ -138,6 +139,7 @@ struct fsl_esdhc_priv { > #endif > struct udevice *dev; > int non_removable; > + int broken_cd; > int wp_enable; > int vs18_enable; > u32 flags; > @@ -1092,6 +1094,9 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv > *priv) > #if CONFIG_IS_ENABLED(DM_MMC) > if (priv->non_removable) > return 1; > + > + if (priv->broken_cd) > + return 1; > #ifdef CONFIG_DM_GPIO > if (dm_gpio_is_valid(&priv->cd_gpio)) > return dm_gpio_get_value(&priv->cd_gpio); > @@ -1450,6 +1455,9 @@ static int fsl_esdhc_probe(struct udevice *dev) > ESDHC_STROBE_DLL_CTRL_SLV_DLY_TARGET_DEFAULT); > priv->strobe_dll_delay_target = val; > > + if (dev_read_bool(dev, "broken-cd")) > + priv->broken_cd = 1; > + > if (dev_read_bool(dev, "non-removable")) { > priv->non_removable = 1; > } else { >
Reviewed-by: Stefano Babic <sba...@denx.de> Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de =====================================================================