aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/core.c
diff options
context:
space:
mode:
authorSeungwon Jeon <tgih.jun@samsung.com>2014-04-23 04:07:35 -0400
committerChris Ball <chris@printf.net>2014-05-12 18:05:53 -0400
commitcdc991790c51c693d0c347a5286af017826a5d01 (patch)
tree6a40a17c97298372886e1c41a5b892974743a680 /drivers/mmc/core/core.c
parentb78871d0cf13d37e7bdcf39c49782ca3885343bc (diff)
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: Seungwon Jeon <tgih.jun@samsung.com> Tested-by: Jaehoon Chung <jh80.chung@samsung.com> Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/core/core.c')
-rw-r--r--drivers/mmc/core/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d97dff5fab62..02baa30653fa 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2192,7 +2192,7 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen)
2192{ 2192{
2193 struct mmc_command cmd = {0}; 2193 struct mmc_command cmd = {0};
2194 2194
2195 if (mmc_card_blockaddr(card) || mmc_card_ddr_mode(card)) 2195 if (mmc_card_blockaddr(card) || mmc_card_ddr52(card))
2196 return 0; 2196 return 0;
2197 2197
2198 cmd.opcode = MMC_SET_BLOCKLEN; 2198 cmd.opcode = MMC_SET_BLOCKLEN;
@@ -2272,7 +2272,6 @@ static int mmc_do_hw_reset(struct mmc_host *host, int check)
2272 } 2272 }
2273 } 2273 }
2274 2274
2275 host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_DDR);
2276 if (mmc_host_is_spi(host)) { 2275 if (mmc_host_is_spi(host)) {
2277 host->ios.chip_select = MMC_CS_HIGH; 2276 host->ios.chip_select = MMC_CS_HIGH;
2278 host->ios.bus_mode = MMC_BUSMODE_PUSHPULL; 2277 host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;