mmc: sdio: fully reconfigure oldcard on resume (9b966aae) · Commits · 戴 / test

On resume, let mmc_sdio_init_card go all the way, instead of skipping the reconfiguration of the card's speed and width. This is needed to ensure cards wake up with their clock reconfigured (otherwise it's kept low). This patch also removes the explicit bus width reconfiguration on resume, since now this is part of mmc_sdio_init_card. Signed-off-by:

Ohad Ben-Cohen <ohad@wizery.com> Tested-by:

Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by:

Chris Ball <cjb@laptop.org>

drivers/mmc/core/sdio.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -456,7 +456,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
		return -ENOENT;

		card = oldcard;
		return 0;
		}

		if (card->type == MMC_TYPE_SD_COMBO) {
		@@ -614,14 +613,6 @@ static int mmc_sdio_resume(struct mmc_host *host)
		mmc_claim_host(host);
		err = mmc_sdio_init_card(host, host->ocr, host->card,
		(host->pm_flags & MMC_PM_KEEP_POWER));
		if (!err) {
		/* We may have switched to 1-bit mode during suspend. */
		err = sdio_enable_4bit_bus(host->card);
		if (err > 0) {
		mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
		err = 0;
		}
		}
		if (!err && host->sdio_irqs)
		mmc_signal_sdio_irq(host);
		mmc_release_host(host);

Admin message