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

Commit 2a0e4ab7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci: add support nonhotplug" into msm-4.9

parents 8bf5ed74 e3b17cf0

drivers/mmc/host/sdhci.c

+2 −1
Original line number Diff line number Diff line
@@ -3706,7 +3706,8 @@ int sdhci_setup_host(struct sdhci_host *host) 


	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&

	    mmc_card_is_removable(mmc) &&

	    mmc_gpio_get_cd(host->mmc) < 0)

	    mmc_gpio_get_cd(host->mmc) < 0 &&

	    !(mmc->caps2 & MMC_CAP2_NONHOTPLUG))

		mmc->caps |= MMC_CAP_NEEDS_POLL;



	/* If vqmmc regulator and no 1.8V signalling, then there's no UHS */

include/linux/mmc/host.h

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ struct mmc_host { 
#define MMC_CAP2_PACKED_WR_CONTROL (1 << 23)	/* Allow write packing control */

#define MMC_CAP2_CLK_SCALE	(1 << 24)	/* Allow dynamic clk scaling */

#define MMC_CAP2_ASYNC_SDIO_IRQ_4BIT_MODE (1 << 25)	/* Allows Asynchronous SDIO irq while card is in 4-bit mode */

#define MMC_CAP2_NONHOTPLUG	(1 << 26)	/*Don't support hotplug*/



	mmc_pm_flag_t		pm_caps;	/* supported pm features */