From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Date: Thu, 30 Mar 2017 13:36:06 +0900 Subject: [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK In-Reply-To: <1490194834-12450-5-git-send-email-jjhiblot@ti.com> References: <1490194834-12450-1-git-send-email-jjhiblot@ti.com> <1490194834-12450-5-git-send-email-jjhiblot@ti.com> Message-ID: <30499cb3-e4b2-a6a1-ef33-58cd5ce89d36@samsung.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote: > Signed-off-by: Jean-Jacques Hiblot 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), >