Message ID | 1490194834-12450-5-git-send-email-jjhiblot@ti.com |
---|---|
State | Accepted |
Commit | 17c9a1c121e7d78d820fdb4f7ca070f53e23c29a |
Delegated to: | Jaehoon Chung |
Headers | show |
On Wed, Mar 22, 2017 at 04:00:34PM +0100, Jean-Jacques Hiblot wrote: > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote: > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Applied on u-boot-mmc. Thanks! Best Regards, Jaehoon Chung > --- > drivers/mmc/omap_hsmmc.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c > index 104129f..83dda09 100644 > --- a/drivers/mmc/omap_hsmmc.c > +++ b/drivers/mmc/omap_hsmmc.c > @@ -58,6 +58,7 @@ DECLARE_GLOBAL_DATA_PTR; > > struct omap_hsmmc_plat { > struct mmc_config cfg; > + struct mmc mmc; > }; > > struct omap_hsmmc_data { > @@ -814,6 +815,15 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) > return 0; > } > > +#ifdef CONFIG_BLK > + > +static int omap_hsmmc_bind(struct udevice *dev) > +{ > + struct omap_hsmmc_plat *plat = dev_get_platdata(dev); > + > + return mmc_bind(dev, &plat->mmc, &plat->cfg); > +} > +#endif > static int omap_hsmmc_probe(struct udevice *dev) > { > struct omap_hsmmc_plat *plat = dev_get_platdata(dev); > @@ -825,9 +835,13 @@ static int omap_hsmmc_probe(struct udevice *dev) > cfg->name = "OMAP SD/MMC"; > cfg->ops = &omap_hsmmc_ops; > > +#ifdef CONFIG_BLK > + mmc = &plat->mmc; > +#else > mmc = mmc_create(cfg, priv); > if (mmc == NULL) > return -1; > +#endif > > #ifdef OMAP_HSMMC_USE_GPIO > gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); > @@ -852,6 +866,9 @@ U_BOOT_DRIVER(omap_hsmmc) = { > .id = UCLASS_MMC, > .of_match = omap_hsmmc_ids, > .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, > +#ifdef CONFIG_BLK > + .bind = omap_hsmmc_bind, > +#endif > .probe = omap_hsmmc_probe, > .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), > .platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat), >
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 104129f..83dda09 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -58,6 +58,7 @@ DECLARE_GLOBAL_DATA_PTR; struct omap_hsmmc_plat { struct mmc_config cfg; + struct mmc mmc; }; struct omap_hsmmc_data { @@ -814,6 +815,15 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) return 0; } +#ifdef CONFIG_BLK + +static int omap_hsmmc_bind(struct udevice *dev) +{ + struct omap_hsmmc_plat *plat = dev_get_platdata(dev); + + return mmc_bind(dev, &plat->mmc, &plat->cfg); +} +#endif static int omap_hsmmc_probe(struct udevice *dev) { struct omap_hsmmc_plat *plat = dev_get_platdata(dev); @@ -825,9 +835,13 @@ static int omap_hsmmc_probe(struct udevice *dev) cfg->name = "OMAP SD/MMC"; cfg->ops = &omap_hsmmc_ops; +#ifdef CONFIG_BLK + mmc = &plat->mmc; +#else mmc = mmc_create(cfg, priv); if (mmc == NULL) return -1; +#endif #ifdef OMAP_HSMMC_USE_GPIO gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); @@ -852,6 +866,9 @@ U_BOOT_DRIVER(omap_hsmmc) = { .id = UCLASS_MMC, .of_match = omap_hsmmc_ids, .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, +#ifdef CONFIG_BLK + .bind = omap_hsmmc_bind, +#endif .probe = omap_hsmmc_probe, .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), .platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> --- drivers/mmc/omap_hsmmc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)