aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/mmc.c
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2010-10-11 05:43:50 -0400
committerChris Ball <cjb@laptop.org>2010-10-23 09:11:16 -0400
commit49e3b5a44f8abd33c8693edc575c6d06a210d778 (patch)
treea68dfc6613a17d1c0eb68d87d63a3562eea26a80 /drivers/mmc/core/mmc.c
parent0f8d8ea64ec7c77ca5beb59534d386fe0235961a (diff)
mmc: refine DDR support
One flaw with DDR support is that MMC core does not inform the driver which DDR mode it has selected. This patch expands the ios->ddr flag to do that. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/mmc.c')
-rw-r--r--drivers/mmc/core/mmc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 3ea58ce773f..df2a817303b 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -375,7 +375,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
375 struct mmc_card *oldcard) 375 struct mmc_card *oldcard)
376{ 376{
377 struct mmc_card *card; 377 struct mmc_card *card;
378 int err, ddr = 0; 378 int err, ddr = MMC_SDR_MODE;
379 u32 cid[4]; 379 u32 cid[4];
380 unsigned int max_dtr; 380 unsigned int max_dtr;
381 381
@@ -523,10 +523,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
523 if (mmc_card_highspeed(card)) { 523 if (mmc_card_highspeed(card)) {
524 if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_8V) 524 if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_8V)
525 && (host->caps & (MMC_CAP_1_8V_DDR))) 525 && (host->caps & (MMC_CAP_1_8V_DDR)))
526 ddr = 1; 526 ddr = MMC_1_8V_DDR_MODE;
527 else if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_2V) 527 else if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_2V)
528 && (host->caps & (MMC_CAP_1_2V_DDR))) 528 && (host->caps & (MMC_CAP_1_2V_DDR)))
529 ddr = 1; 529 ddr = MMC_1_2V_DDR_MODE;
530 } 530 }
531 531
532 /* 532 /*