On 09/06/16 10:10, Gregory CLEMENT wrote: > From: Marcin Wojtas <mw@xxxxxxxxxxxx> > > Some sdhci hosts may require handling quirks during card initialization > at the time when its type is already known. Hence a new callback > (init_card) is added in sdhci_ops. I plan to remove init_card and other host ops that sdhci doesn't use (like sdhci_select_drive_strength). The driver must provide the mmc op instead. e.g. in sdhci-xenon.c host->mmc_host_ops.init_card = sdhci_xenon_init_card > > Signed-off-by: Marcin Wojtas <mw@xxxxxxxxxxxx> > Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx> > --- > drivers/mmc/host/sdhci.c | 9 +++++++++ > drivers/mmc/host/sdhci.h | 1 + > 2 files changed, 10 insertions(+) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 0e3d7c056cb1..fd4e9a84f739 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -2117,6 +2117,14 @@ static void sdhci_card_event(struct mmc_host *mmc) > spin_unlock_irqrestore(&host->lock, flags); > } > > +static void sdhci_init_card(struct mmc_host *mmc, struct mmc_card *card) > +{ > + struct sdhci_host *host = mmc_priv(mmc); > + > + if (host->ops->init_card) > + host->ops->init_card(host, card); > +} > + > static const struct mmc_host_ops sdhci_ops = { > .request = sdhci_request, > .post_req = sdhci_post_req, > @@ -2132,6 +2140,7 @@ static const struct mmc_host_ops sdhci_ops = { > .select_drive_strength = sdhci_select_drive_strength, > .card_event = sdhci_card_event, > .card_busy = sdhci_card_busy, > + .init_card = sdhci_init_card, > }; > > /*****************************************************************************\ > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index 609f87ca536b..49c6c5b0e33b 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -549,6 +549,7 @@ struct sdhci_ops { > struct mmc_card *card, > unsigned int max_dtr, int host_drv, > int card_drv, int *drv_type); > + void (*init_card)(struct sdhci_host *host, struct mmc_card *card); > }; > > #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html