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

Commit 10942aa4 authored by Seungwon Jeon's avatar Seungwon Jeon Committed by Chris Ball
Browse files

mmc: core: fix the signaling 1.8V for HS200 



Currently only 1.2V is treated for HS200 mode. If the host has only
1.8V I/O capability not 1.2V, mmc_set_signal_voltage can't be called
for 1.8V HS200. EXT_CSD_CARD_TYPE_SDR_1_8V needs to be considered.

Signed-off-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 96cf5f02

drivers/mmc/core/mmc.c

+7 −5
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int mmc_select_powerclass(struct mmc_card *card, 
 */

static int mmc_select_hs200(struct mmc_card *card)

{

	int idx, err = 0;

	int idx, err = -EINVAL;

	struct mmc_host *host;

	static unsigned ext_csd_bits[] = {

		EXT_CSD_BUS_WIDTH_4,
@@ -745,9 +745,11 @@ static int mmc_select_hs200(struct mmc_card *card) 


	if (card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_2V &&

			host->caps2 & MMC_CAP2_HS200_1_2V_SDR)

		if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0))

			err = mmc_set_signal_voltage(host,

						     MMC_SIGNAL_VOLTAGE_180, 0);

		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0);



	if (err && card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_8V &&

			host->caps2 & MMC_CAP2_HS200_1_8V_SDR)

		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, 0);



	/* If fails try again during next card power cycle */

	if (err)