mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
mmc: fsl_esdhc: make GPIO support optional
There would be compiling error as below when enable driver model for esdhc. undefined reference to `dm_gpio_get_value' undefined reference to `gpio_request_by_name_nodev' This patch is to make GPIO support optional with CONFIG_DM_GPIO. Because all boards of QorIQ platform don't need it and they just check register for CD/WP status, only some boards of i.MX platform require this. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
parent
3564208e01
commit
fc8048a88e
1 changed files with 8 additions and 2 deletions
|
@ -104,8 +104,10 @@ struct fsl_esdhc_priv {
|
||||||
struct udevice *dev;
|
struct udevice *dev;
|
||||||
int non_removable;
|
int non_removable;
|
||||||
int wp_enable;
|
int wp_enable;
|
||||||
|
#ifdef CONFIG_DM_GPIO
|
||||||
struct gpio_desc cd_gpio;
|
struct gpio_desc cd_gpio;
|
||||||
struct gpio_desc wp_gpio;
|
struct gpio_desc wp_gpio;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Return the XFERTYP flags for a given command and data packet */
|
/* Return the XFERTYP flags for a given command and data packet */
|
||||||
|
@ -687,9 +689,10 @@ static int esdhc_getcd(struct mmc *mmc)
|
||||||
#ifdef CONFIG_DM_MMC
|
#ifdef CONFIG_DM_MMC
|
||||||
if (priv->non_removable)
|
if (priv->non_removable)
|
||||||
return 1;
|
return 1;
|
||||||
|
#ifdef CONFIG_DM_GPIO
|
||||||
if (dm_gpio_is_valid(&priv->cd_gpio))
|
if (dm_gpio_is_valid(&priv->cd_gpio))
|
||||||
return dm_gpio_get_value(&priv->cd_gpio);
|
return dm_gpio_get_value(&priv->cd_gpio);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_CINS) && --timeout)
|
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_CINS) && --timeout)
|
||||||
|
@ -967,17 +970,20 @@ static int fsl_esdhc_probe(struct udevice *dev)
|
||||||
priv->non_removable = 1;
|
priv->non_removable = 1;
|
||||||
} else {
|
} else {
|
||||||
priv->non_removable = 0;
|
priv->non_removable = 0;
|
||||||
|
#ifdef CONFIG_DM_GPIO
|
||||||
gpio_request_by_name_nodev(fdt, node, "cd-gpios", 0,
|
gpio_request_by_name_nodev(fdt, node, "cd-gpios", 0,
|
||||||
&priv->cd_gpio, GPIOD_IS_IN);
|
&priv->cd_gpio, GPIOD_IS_IN);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->wp_enable = 1;
|
priv->wp_enable = 1;
|
||||||
|
|
||||||
|
#ifdef CONFIG_DM_GPIO
|
||||||
ret = gpio_request_by_name_nodev(fdt, node, "wp-gpios", 0,
|
ret = gpio_request_by_name_nodev(fdt, node, "wp-gpios", 0,
|
||||||
&priv->wp_gpio, GPIOD_IS_IN);
|
&priv->wp_gpio, GPIOD_IS_IN);
|
||||||
if (ret)
|
if (ret)
|
||||||
priv->wp_enable = 0;
|
priv->wp_enable = 0;
|
||||||
|
#endif
|
||||||
/*
|
/*
|
||||||
* TODO:
|
* TODO:
|
||||||
* Because lack of clk driver, if SDHC clk is not enabled,
|
* Because lack of clk driver, if SDHC clk is not enabled,
|
||||||
|
|
Loading…
Add table
Reference in a new issue