On Fri, 5 Nov 2021 at 10:06, H. Nikolaus Schaller <hns@xxxxxxxxxxxxx> wrote: > > This allows to add quirks based on device tree instead of having > card specific code in the host ops. > > We call it just after where host->ops->init_card() can be optionally > called. > > Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx> > --- > drivers/mmc/core/mmc.c | 1 + > drivers/mmc/core/sd.c | 2 ++ > drivers/mmc/core/sdio.c | 1 + > 3 files changed, 4 insertions(+) > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index 29e58ffae3797..19cd138acaec9 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -1634,6 +1634,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, > */ > if (host->ops->init_card) > host->ops->init_card(host, card); > + mmc_fixup_device(card, sdio_card_init_methods); > > /* > * For native busses: set card RCA and quit open drain mode. > diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c > index 4646b7a03db6b..0d174fdf47164 100644 > --- a/drivers/mmc/core/sd.c > +++ b/drivers/mmc/core/sd.c > @@ -23,6 +23,7 @@ > #include "host.h" > #include "bus.h" > #include "mmc_ops.h" > +#include "quirks.h" > #include "sd.h" > #include "sd_ops.h" > > @@ -1427,6 +1428,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, > */ > if (host->ops->init_card) > host->ops->init_card(host, card); > + mmc_fixup_device(card, sdio_card_init_methods); > > /* > * For native busses: get card RCA and quit open drain mode. > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c > index 68edf7a615be5..cf8ee66990508 100644 > --- a/drivers/mmc/core/sdio.c > +++ b/drivers/mmc/core/sdio.c > @@ -707,6 +707,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, > */ > if (host->ops->init_card) > host->ops->init_card(host, card); > + mmc_fixup_device(card, sdio_card_init_methods); > > /* > * If the host and card support UHS-I mode request the card > -- > 2.33.0 > As the quirk is for SDIO cards, we don't need to call mmc_fixup_device(card, sdio_card_init_methods) - other than from mmc_sdio_init_card(). Additionally, for sd/mmc we should not be using 'sdio_card_init_methods'. That said, it looks also reasonable to me, to squash $subject patch with patch3. Kind regards Uffe
