Commit 818cd405 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Ulf Hansson
Browse files

mmc: core: provide macro and table to match the device tree to apply quirks 



This (initially empty) table allows to match quirks early based
on .compatible of the child node of some mmc/sdio interface.

This allows to add quirks based on device tree instead of having
card specific code in the host ops.

A new macro SDIO_FIXUP_COMPATIBLE makes the definition readable.

And we call mmc_fixup_device(sdio_card_init_methods) just after
where host->ops->init_card() can be optionally called.

Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Link: https://lore.kernel.org/r/b13fd8b3eebc3c23b6816b254a518c224cbdcfd4.1636564631.git.hns@goldelico.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b360b110

drivers/mmc/core/card.h

+15 −0
Original line number Diff line number Diff line
@@ -122,6 +122,21 @@ struct mmc_fixup { 
		   _vendor, _device,					\

		   _fixup, _data, EXT_CSD_REV_ANY)			\



#define SDIO_FIXUP_COMPATIBLE(_compatible, _fixup, _data)		\

	{						\

		.name = CID_NAME_ANY,			\

		.manfid = CID_MANFID_ANY,		\

		.oemid = CID_OEMID_ANY,			\

		.rev_start = 0,				\

		.rev_end = -1ull,			\

		.cis_vendor = SDIO_ANY_ID,		\

		.cis_device = SDIO_ANY_ID,		\

		.vendor_fixup = (_fixup),		\

		.data = (_data),			\

		.ext_csd_rev = EXT_CSD_REV_ANY,		\

		.of_compatible = _compatible,	\

	}



#define cid_rev(hwrev, fwrev, year, month)	\

	(((u64) hwrev) << 40 |			\

	 ((u64) fwrev) << 32 |			\

drivers/mmc/core/quirks.h

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ static const struct mmc_fixup __maybe_unused sdio_fixup_methods[] = { 
	END_FIXUP

};



static const struct mmc_fixup __maybe_unused sdio_card_init_methods[] = {

	END_FIXUP

};



static inline bool mmc_fixup_of_compatible_match(struct mmc_card *card,

						 const char *compatible)

{

drivers/mmc/core/sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -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