Commit 1720d354 authored Sep 30, 2016 by Shawn Lin Committed by Ulf Hansson Oct 10, 2016

mmc: core: switch to 1V8 or 1V2 for hs400es mode



When introducing hs400es, I didn't notice that we haven't
switched voltage to 1V2 or 1V8 for it. That happens to work
as the first controller claiming to support hs400es, arasan(5.1),
which is designed to only support 1V8. So the voltage is fixed to 1V8.
But it actually is wrong, and will not fit for other host controllers.
Let's fix it.

Fixes: commit 81ac2af6 ("mmc: core: implement enhanced strobe support")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 48ab086d

drivers/mmc/core/mmc.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1263,6 +1263,16 @@ static int mmc_select_hs400es(struct mmc_card *card)
		goto out_err;
		}

		if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V)
		err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120);

		if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V)
		err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);

		/* If fails try again during next card power cycle */
		if (err)
		goto out_err;

		err = mmc_select_bus_width(card);
		if (err < 0)
		goto out_err;

Admin message