Commit 108ecc4c authored by Aaron Lu's avatar Aaron Lu Committed by Chris Ball
Browse files

mmc: core: reset signal voltage on power up 



Add a call to mmc_set_signal_voltage() to set signal voltage to 3.3v in
mmc_power_up so that we do not need to touch signal voltage setting in
mmc/sd/sdio init functions and rescan function.

For mmc/sd cards, when doing a suspend/resume cycle, consider the unsafe
resume case, the card will lose its power and when powered on again, we
will set signal voltage to 3.3v in mmc_power_up before its resume function
gets called, which will re-init the card.

And for sdio cards, when doing a suspend/resume cycle, consider the unsafe
resume case, the card will either lose its power or not depending on if it
wants to wakeup the host. If power is not maintained, it is the same case as
mmc/sd cards. If power is maintained, mmc_power_up will not be called and
the card's signal voltage will remain at the last setting.

Signed-off-by: default avatarAaron Lu <aaron.lu@amd.com>
Tested-by: default avatarVenkatraman S <svenkatr@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 55c4665e

drivers/mmc/core/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1212,6 +1212,9 @@ static void mmc_power_up(struct mmc_host *host) 
	host->ios.timing = MMC_TIMING_LEGACY;

	mmc_set_ios(host);



	/* Set signal voltage to 3.3V */

	mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, false);



	/*

	 * This delay should be sufficient to allow the power supply

	 * to reach the minimum voltage.
@@ -1963,9 +1966,6 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) 
	 */

	mmc_hw_reset_for_init(host);



	/* Initialization should be done at 3.3 V I/O voltage. */

	mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0);



	/*

	 * sdio_reset sends CMD52 to reset card.  Since we do not know

	 * if the card is being re-initialized, just send it.  CMD52

drivers/mmc/core/mmc.c

+0 −3
Original line number Diff line number Diff line
@@ -818,9 +818,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	if (!mmc_host_is_spi(host))

		mmc_set_bus_mode(host, MMC_BUSMODE_OPENDRAIN);



	/* Initialization should be done at 3.3 V I/O voltage. */

	mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0);



	/*

	 * Since we're changing the OCR value, we seem to

	 * need to tell some cards to go back to the idle

drivers/mmc/core/sd.c

+0 −3
Original line number Diff line number Diff line
@@ -901,9 +901,6 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 
	BUG_ON(!host);

	WARN_ON(!host->claimed);



	/* The initialization should be done at 3.3 V I/O voltage. */

	mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0);



	err = mmc_sd_get_cid(host, ocr, cid, &rocr);

	if (err)

		return err;

drivers/mmc/core/sdio.c

+0 −7
Original line number Diff line number Diff line
@@ -591,9 +591,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, 
	 * Inform the card of the voltage

	 */

	if (!powered_resume) {

		/* The initialization should be done at 3.3 V I/O voltage. */

		mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0);



		err = mmc_send_io_op_cond(host, host->ocr, &ocr);

		if (err)

			goto err;
@@ -1006,10 +1003,6 @@ static int mmc_sdio_power_restore(struct mmc_host *host) 
	 * restore the correct voltage setting of the card.

	 */



	/* The initialization should be done at 3.3 V I/O voltage. */

	if (!mmc_card_keep_power(host))

		mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0);



	sdio_reset(host);

	mmc_go_idle(host);

	mmc_send_if_cond(host, host->ocr_avail);

CRA Git | Maintained and supported by SUSTech CRA and CCSE