Hi Adam,
> For some boards, DM_REGULATOR and DM_GPIO may not be enabled in
> SPL but enabled in U-Boot. So switching to CONFIG_IS_ENABLED from
> ifdef allows the esdhc driver to function with some limited
> functionality in SPL.
>
> Signed-off-by: Adam Ford <aford...@gmail.com>
>
> diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
> index 74007e2ad4..1faae1987a 100644
> --- a/drivers/mmc/fsl_esdhc.c
> +++ b/drivers/mmc/fsl_esdhc.c
> @@ -1395,7 +1395,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
> int node = dev_of_offset(dev);
> struct esdhc_soc_data *data =
> (struct esdhc_soc_data *)dev_get_driver_data(dev);
> -#ifdef CONFIG_DM_REGULATOR
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> struct udevice *vqmmc_dev;
> #endif
> fdt_addr_t addr;
> @@ -1436,7 +1436,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
> priv->non_removable = 1;
> } else {
> priv->non_removable = 0;
> -#ifdef CONFIG_DM_GPIO
> +#if CONFIG_IS_ENABLED(DM_GPIO)
> gpio_request_by_name(dev, "cd-gpios", 0,
> &priv->cd_gpio, GPIOD_IS_IN);
> #endif
> @@ -1453,7 +1453,7 @@ static int fsl_esdhc_probe(struct udevice *dev)
>
> priv->vs18_enable = 0;
>
> -#ifdef CONFIG_DM_REGULATOR
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> /*
> * If emmc I/O has a fixed voltage at 1.8V, this must be
> provided,
> * otherwise, emmc will work abnormally.Reviewed-by: Lukasz Majewski <lu...@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lu...@denx.de
pgpppubh1Q2tL.pgp
Description: OpenPGP digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
