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

Commit 1b8d79c5 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Allow hosts to specify non-support for SD commands 



There are host drivers which needs to valdiate for non-supported SD
commands and returnn error code for such requests.

To improve and simplify the behaviour, let's invent MMC_CAP2_NO_SD
which these host drivers can set to tell the mmc core to skip sending SD
commands during card initialization.

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

drivers/mmc/core/core.c

+6 −3
Original line number Diff line number Diff line
@@ -2498,6 +2498,7 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) 


	mmc_go_idle(host);



	if (!(host->caps2 & MMC_CAP2_NO_SD))

		mmc_send_if_cond(host, host->ocr_avail);



	/* Order's important: probe SDIO, then SD, then MMC */
@@ -2505,8 +2506,10 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) 
		if (!mmc_attach_sdio(host))

			return 0;



	if (!(host->caps2 & MMC_CAP2_NO_SD))

		if (!mmc_attach_sd(host))

			return 0;



	if (!mmc_attach_mmc(host))

		return 0;

include/linux/mmc/host.h

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ struct mmc_host { 
#define MMC_CAP2_NO_WRITE_PROTECT (1 << 18)	/* No physical write protect pin, assume that card is always read-write */

#define MMC_CAP2_NO_SDIO	(1 << 19)	/* Do not send SDIO commands during initialization */

#define MMC_CAP2_HS400_ES	(1 << 20)	/* Host supports enhanced strobe */

#define MMC_CAP2_NO_SD		(1 << 21)	/* Do not send SD commands during initialization */



	mmc_pm_flag_t		pm_caps;	/* supported pm features */