Commit 96e0cbca authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: apply the necessary SDIO quirks for the Silabs WF200 



Until now, the SDIO quirks are applied directly from the driver.
However, it is better to apply the quirks before driver probing. So,
this patch relocate the quirks in the MMC framework.

Note that the WF200 has no valid SDIO VID/PID. Therefore, we match DT
rather than on the SDIO VID/PID.

Reviewed-by: default avatarPali Rohár <pali@kernel.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220216093112.92469-3-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f86ecba

drivers/mmc/core/quirks.h

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ static const struct mmc_fixup __maybe_unused sdio_fixup_methods[] = { 
static const struct mmc_fixup __maybe_unused sdio_card_init_methods[] = {

	SDIO_FIXUP_COMPATIBLE("ti,wl1251", wl1251_quirk, 0),



	SDIO_FIXUP_COMPATIBLE("silabs,wf200", add_quirk,

			      MMC_QUIRK_BROKEN_BYTE_MODE_512 |

			      MMC_QUIRK_LENIENT_FN0 |

			      MMC_QUIRK_BLKSZ_FOR_BYTE_MODE),



	END_FIXUP

};

drivers/staging/wfx/bus_sdio.c

+0 −3
Original line number Diff line number Diff line
@@ -216,9 +216,6 @@ static int wfx_sdio_probe(struct sdio_func *func, const struct sdio_device_id *i 
	bus->func = func;

	bus->of_irq = irq_of_parse_and_map(np, 0);

	sdio_set_drvdata(func, bus);

	func->card->quirks |= MMC_QUIRK_LENIENT_FN0 |

			      MMC_QUIRK_BLKSZ_FOR_BYTE_MODE |

			      MMC_QUIRK_BROKEN_BYTE_MODE_512;



	sdio_claim_host(func);

	ret = sdio_enable_func(func);