Commit 592b179f authored Feb 19, 2020 by Haibo Chen Committed by Greg Kroah-Hartman Jul 22, 2020

mmc: sdhci: do not enable card detect interrupt for gpio cd type



[ Upstream commit e65bb38824711559844ba932132f417bc5a355e2 ]

Except SDHCI_QUIRK_BROKEN_CARD_DETECTION and MMC_CAP_NONREMOVABLE,
we also do not need to handle controller native card detect interrupt
for gpio cd type.
If we wrong enabled the card detect interrupt for gpio case, it will
cause a lot of unexpected card detect interrupts during data transfer
which should not happen.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/1582100563-20555-2-git-send-email-haibo.chen@nxp.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e60b0292

drivers/mmc/host/sdhci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -152,7 +152,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
	u32 present;		u32 present;

	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) \|\|		if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) \|\|
	!mmc_card_is_removable(host->mmc))		!mmc_card_is_removable(host->mmc) \|\| mmc_can_gpio_cd(host->mmc))
	return;		return;

	if (enable) {		if (enable) {