dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mmc: davinci: drop struct davinci_mmc_plat"

Browse Source 
Adam Ford reports that this change breaks booting on da850-evm and
Bartosz Golaszewski agrees that with the impending release we should
revert the change for now.  With that noted:

This reverts commit 21a4d80a71.

Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Tested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2020-01-03 12:00:04 -05:00
parent 70bd39d72a
commit 797eee36a1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mmc/davinci_mmc.c
View File

@@ -32,6 +32,10 @@ struct davinci_mmc_priv {
uint input_clk; /* Input clock to MMC controller */ uint input_clk; /* Input clock to MMC controller */
struct gpio_desc cd_gpio; /* Card Detect GPIO */ struct gpio_desc cd_gpio; /* Card Detect GPIO */
struct gpio_desc wp_gpio; /* Write Protect GPIO */ struct gpio_desc wp_gpio; /* Write Protect GPIO */
};
struct davinci_mmc_plat
{
struct mmc_config cfg; struct mmc_config cfg;
struct mmc mmc; struct mmc mmc;
}; };
@@ -480,8 +484,9 @@ int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host)
static int davinci_mmc_probe(struct udevice *dev) static int davinci_mmc_probe(struct udevice *dev)
{ {
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
struct davinci_mmc_plat *plat = dev_get_platdata(dev);
struct davinci_mmc_priv *priv = dev_get_priv(dev); struct davinci_mmc_priv *priv = dev_get_priv(dev);
struct mmc_config *cfg = &priv->cfg; struct mmc_config *cfg = &plat->cfg;
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
int ret; int ret;
#endif #endif
@@ -502,7 +507,7 @@ static int davinci_mmc_probe(struct udevice *dev)
gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN); gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, GPIOD_IS_IN);
#endif #endif
upriv->mmc = &priv->mmc; upriv->mmc = &plat->mmc;
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* /*
@@ -513,7 +518,7 @@ static int davinci_mmc_probe(struct udevice *dev)
* support in SPL, hence the hard-coded base register address. * support in SPL, hence the hard-coded base register address.
*/ */
priv->reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE; priv->reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE;
ret = mmc_bind(dev, &priv->mmc, &priv->cfg); ret = mmc_bind(dev, &plat->mmc, &plat->cfg);
if (ret) if (ret)
return ret; return ret;
#endif #endif
@@ -523,9 +528,9 @@ static int davinci_mmc_probe(struct udevice *dev)
static int davinci_mmc_bind(struct udevice *dev) static int davinci_mmc_bind(struct udevice *dev)
{ {
struct davinci_mmc_priv *priv = dev_get_priv(dev); struct davinci_mmc_plat *plat = dev_get_platdata(dev);
return mmc_bind(dev, &priv->mmc, &priv->cfg); return mmc_bind(dev, &plat->mmc, &plat->cfg);
} }
static const struct udevice_id davinci_mmc_ids[] = { static const struct udevice_id davinci_mmc_ids[] = {
@@ -542,6 +547,7 @@ U_BOOT_DRIVER(davinci_mmc_drv) = {
#endif #endif
.probe = davinci_mmc_probe, .probe = davinci_mmc_probe,
.ops = &davinci_mmc_ops, .ops = &davinci_mmc_ops,
.platdata_auto_alloc_size = sizeof(struct davinci_mmc_plat),
.priv_auto_alloc_size = sizeof(struct davinci_mmc_priv), .priv_auto_alloc_size = sizeof(struct davinci_mmc_priv),
}; };
#endif #endif