diff options
author | Jaehoon Chung <jh80.chung@samsung.com> | 2012-11-08 03:35:29 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-12-06 13:55:11 -0500 |
commit | bf7cb2244c80b1390c51dfc33a88b56ce88a8986 (patch) | |
tree | c06321db7542508e8748c0012620d0c68ba68ff4 /drivers/mmc/host/dw_mmc.c | |
parent | ccb52a00fd3fdea428e29816cbacb0a78090d474 (diff) |
mmc: dw_mmc: relocate where dw_mci_setup_bus() is called from
To ensure the stable clock need to enable before set the
DW_MMC_CARD_NEED_INIT flag. If set DW_MMC_CARD_NEED_INIT flag,
wait for 80-clock before first command after power-up.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/dw_mmc.c')
-rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 6785d62ef047..fa8b14cce33a 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c | |||
@@ -683,9 +683,6 @@ static void __dw_mci_start_request(struct dw_mci *host, | |||
683 | if (host->pdata->select_slot) | 683 | if (host->pdata->select_slot) |
684 | host->pdata->select_slot(slot->id); | 684 | host->pdata->select_slot(slot->id); |
685 | 685 | ||
686 | /* Slot specific timing and width adjustment */ | ||
687 | dw_mci_setup_bus(slot, false); | ||
688 | |||
689 | host->cur_slot = slot; | 686 | host->cur_slot = slot; |
690 | host->mrq = mrq; | 687 | host->mrq = mrq; |
691 | 688 | ||
@@ -812,6 +809,9 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
812 | if (drv_data && drv_data->set_ios) | 809 | if (drv_data && drv_data->set_ios) |
813 | drv_data->set_ios(slot->host, ios); | 810 | drv_data->set_ios(slot->host, ios); |
814 | 811 | ||
812 | /* Slot specific timing and width adjustment */ | ||
813 | dw_mci_setup_bus(slot, false); | ||
814 | |||
815 | switch (ios->power_mode) { | 815 | switch (ios->power_mode) { |
816 | case MMC_POWER_UP: | 816 | case MMC_POWER_UP: |
817 | set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags); | 817 | set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags); |