diff options
author | Johan Rudholm <johan.rudholm@stericsson.com> | 2013-01-28 09:08:24 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:37:05 -0500 |
commit | 3f8a7fabd60e83eb2fb7add00d353d455c0e7a78 (patch) | |
tree | 0c6241060f9347214d3c1b5026970c6b1457e719 /drivers/mmc | |
parent | d0123ccac55088811bde4f76c4a3fdbd39c3cfba (diff) |
mmc: sd: Simplify by using mmc_host_uhs
Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/core/sd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 74972c241dff..937363948079 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
@@ -444,8 +444,7 @@ static void sd_update_bus_speed_mode(struct mmc_card *card) | |||
444 | * If the host doesn't support any of the UHS-I modes, fallback on | 444 | * If the host doesn't support any of the UHS-I modes, fallback on |
445 | * default speed. | 445 | * default speed. |
446 | */ | 446 | */ |
447 | if (!(card->host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | | 447 | if (!mmc_host_uhs(card->host)) { |
448 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) { | ||
449 | card->sd_bus_speed = 0; | 448 | card->sd_bus_speed = 0; |
450 | return; | 449 | return; |
451 | } | 450 | } |
@@ -736,8 +735,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) | |||
736 | * If the host supports one of UHS-I modes, request the card | 735 | * If the host supports one of UHS-I modes, request the card |
737 | * to switch to 1.8V signaling level. | 736 | * to switch to 1.8V signaling level. |
738 | */ | 737 | */ |
739 | if (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | | 738 | if (mmc_host_uhs(host)) |
740 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50)) | ||
741 | ocr |= SD_OCR_S18R; | 739 | ocr |= SD_OCR_S18R; |
742 | 740 | ||
743 | /* | 741 | /* |