Commit 3f8a7fab authored by Johan Rudholm's avatar Johan Rudholm Committed by Chris Ball
Browse files

mmc: sd: Simplify by using mmc_host_uhs 



Signed-off-by: default avatarJohan Rudholm <johan.rudholm@stericsson.com>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent d0123cca

drivers/mmc/core/sd.c

+2 −4
Original line number Diff line number Diff line
@@ -444,8 +444,7 @@ static void sd_update_bus_speed_mode(struct mmc_card *card) 
	 * If the host doesn't support any of the UHS-I modes, fallback on

	 * default speed.

	 */

	if (!(card->host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |

	    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) {

	if (!mmc_host_uhs(card->host)) {

		card->sd_bus_speed = 0;

		return;

	}
@@ -736,8 +735,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) 
	 * If the host supports one of UHS-I modes, request the card

	 * to switch to 1.8V signaling level.

	 */

	if (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |

	    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))

	if (mmc_host_uhs(host))

		ocr |= SD_OCR_S18R;



	/*