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

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

mmc: drop the speed mode of card's state 



Timing mode identifier has same role and can take the place
of speed mode. This change removes all related speed mode.

Signed-off-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Tested-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent b78871d0

drivers/mmc/core/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -341,16 +341,16 @@ int mmc_add_card(struct mmc_card *card) 
	if (mmc_host_is_spi(card->host)) {

		pr_info("%s: new %s%s%s card on SPI\n",

			mmc_hostname(card->host),

			mmc_card_highspeed(card) ? "high speed " : "",

			mmc_card_ddr_mode(card) ? "DDR " : "",

			mmc_card_hs(card) ? "high speed " : "",

			mmc_card_ddr52(card) ? "DDR " : "",

			type);

	} else {

		pr_info("%s: new %s%s%s%s%s card at address %04x\n",

			mmc_hostname(card->host),

			mmc_card_uhs(card) ? "ultra high speed " :

			(mmc_card_highspeed(card) ? "high speed " : ""),

			(mmc_card_hs(card) ? "high speed " : ""),

			(mmc_card_hs200(card) ? "HS200 " : ""),

			mmc_card_ddr_mode(card) ? "DDR " : "",

			mmc_card_ddr52(card) ? "DDR " : "",

			uhs_bus_speed_mode, type, card->rca);

	}

drivers/mmc/core/core.c

+1 −2
Original line number Diff line number Diff line
@@ -2192,7 +2192,7 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen) 
{

	struct mmc_command cmd = {0};



	if (mmc_card_blockaddr(card) || mmc_card_ddr_mode(card))

	if (mmc_card_blockaddr(card) || mmc_card_ddr52(card))

		return 0;



	cmd.opcode = MMC_SET_BLOCKLEN;
@@ -2272,7 +2272,6 @@ static int mmc_do_hw_reset(struct mmc_host *host, int check) 
		}

	}



	host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_DDR);

	if (mmc_host_is_spi(host)) {

		host->ios.chip_select = MMC_CS_HIGH;

		host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;

drivers/mmc/core/mmc.c

+3 −8
Original line number Diff line number Diff line
@@ -1083,11 +1083,9 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		} else {

			if (card->ext_csd.hs_max_dtr > 52000000 &&

			    host->caps2 & MMC_CAP2_HS200) {

				mmc_card_set_hs200(card);

				mmc_set_timing(card->host,

					       MMC_TIMING_MMC_HS200);

			} else {

				mmc_card_set_highspeed(card);

				mmc_set_timing(card->host, MMC_TIMING_MMC_HS);

			}

		}
@@ -1098,10 +1096,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	 */

	max_dtr = (unsigned int)-1;



	if (mmc_card_highspeed(card) || mmc_card_hs200(card)) {

	if (mmc_card_hs(card) || mmc_card_hs200(card)) {

		if (max_dtr > card->ext_csd.hs_max_dtr)

			max_dtr = card->ext_csd.hs_max_dtr;

		if (mmc_card_highspeed(card) && (max_dtr > 52000000))

		if (mmc_card_hs(card) && (max_dtr > 52000000))

			max_dtr = 52000000;

	} else if (max_dtr > card->csd.max_dtr) {

		max_dtr = card->csd.max_dtr;
@@ -1112,7 +1110,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	/*

	 * Indicate DDR mode (if supported).

	 */

	if (mmc_card_highspeed(card)) {

	if (mmc_card_hs(card)) {

		if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_8V)

			&& (host->caps & MMC_CAP_1_8V_DDR))

				ddr = MMC_1_8V_DDR_MODE;
@@ -1255,7 +1253,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
				if (err)

					goto err;

			}

			mmc_card_set_ddr_mode(card);

			mmc_set_timing(card->host, MMC_TIMING_MMC_DDR52);

			mmc_set_bus_width(card->host, bus_width);

		}
@@ -1499,7 +1496,6 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend) 
		err = mmc_sleep(host);

	else if (!mmc_host_is_spi(host))

		err = mmc_deselect_cards(host);

	host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);



	if (!err) {

		mmc_power_off(host);
@@ -1629,7 +1625,6 @@ static int mmc_power_restore(struct mmc_host *host) 
{

	int ret;



	host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);

	mmc_claim_host(host);

	ret = mmc_init_card(host, host->card->ocr, host->card);

	mmc_release_host(host);

drivers/mmc/core/sd.c

+3 −13
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ unsigned mmc_sd_get_max_clock(struct mmc_card *card) 
{

	unsigned max_dtr = (unsigned int)-1;



	if (mmc_card_highspeed(card)) {

	if (mmc_card_hs(card)) {

		if (max_dtr > card->sw_caps.hs_max_dtr)

			max_dtr = card->sw_caps.hs_max_dtr;

	} else if (max_dtr > card->csd.max_dtr) {
@@ -897,12 +897,6 @@ unsigned mmc_sd_get_max_clock(struct mmc_card *card) 
	return max_dtr;

}



void mmc_sd_go_highspeed(struct mmc_card *card)

{

	mmc_card_set_highspeed(card);

	mmc_set_timing(card->host, MMC_TIMING_SD_HS);

}



/*

 * Handle the detection and initialisation of a card.

 *
@@ -977,16 +971,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 
		err = mmc_sd_init_uhs_card(card);

		if (err)

			goto free_card;



		/* Card is an ultra-high-speed card */

		mmc_card_set_uhs(card);

	} else {

		/*

		 * Attempt to change to high-speed (if supported)

		 */

		err = mmc_sd_switch_hs(card);

		if (err > 0)

			mmc_sd_go_highspeed(card);

			mmc_set_timing(card->host, MMC_TIMING_SD_HS);

		else if (err)

			goto free_card;
@@ -1081,7 +1072,7 @@ static int _mmc_sd_suspend(struct mmc_host *host) 


	if (!mmc_host_is_spi(host))

		err = mmc_deselect_cards(host);

	host->card->state &= ~MMC_STATE_HIGHSPEED;



	if (!err) {

		mmc_power_off(host);

		mmc_card_set_suspended(host->card);
@@ -1190,7 +1181,6 @@ static int mmc_sd_power_restore(struct mmc_host *host) 
{

	int ret;



	host->card->state &= ~MMC_STATE_HIGHSPEED;

	mmc_claim_host(host);

	ret = mmc_sd_init_card(host, host->card->ocr, host->card);

	mmc_release_host(host);

drivers/mmc/core/sd.h

+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card, 
	bool reinit);

unsigned mmc_sd_get_max_clock(struct mmc_card *card);

int mmc_sd_switch_hs(struct mmc_card *card);

void mmc_sd_go_highspeed(struct mmc_card *card);



#endif