Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1144c1e4 authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: core: improve the quirks for sdio devices 



Rename mmc_fixup_methods to sdio_fixup_methods to better
reflect that it's for sdio devices. So we could also pass
on it from sdio card's probe sequence just like what we do
for eMMC and block there.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 884f3860

drivers/mmc/core/quirks.h

+1 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include "card.h"



static const struct mmc_fixup mmc_fixup_methods[] = {

static const struct mmc_fixup sdio_fixup_methods[] = {

	SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,

		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
@@ -35,10 +35,6 @@ static inline void mmc_fixup_device(struct mmc_card *card, 
	const struct mmc_fixup *f;

	u64 rev = cid_rev_card(card);



	/* Non-core specific workarounds. */

	if (!table)

		table = mmc_fixup_methods;



	for (f = table; f->vendor_fixup; f++) {

		if ((f->manfid == CID_MANFID_ANY ||

		     f->manfid == card->cid.manfid) &&

drivers/mmc/core/sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, 
		card = oldcard;

	}

	card->ocr = ocr_card;

	mmc_fixup_device(card, NULL);

	mmc_fixup_device(card, sdio_fixup_methods);



	if (card->type == MMC_TYPE_SD_COMBO) {

		err = mmc_sd_setup_card(host, card, oldcard != NULL);