[U-Boot] [PATCH] mmc: fsl_esdhc: Move ifdef to CONFIG_IS_ENABLED

10 Jan 2019

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 aford173@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.
-- 
2.17.1


    

Adam Ford

Lukasz Majewski

tags (0)

participants (2)