diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2013-10-16 01:42:05 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2013-10-21 15:57:39 -0400 |
commit | e69e4dff1c0228294572e27df7b2fc4c0b518632 (patch) | |
tree | b2761b92d77b885850cd8651107ca2fc1d6e4739 | |
parent | 7b2399034af31d934ce3efc898e023e027f110bd (diff) |
mmc: bfin_sdh: Forgot to write SDH_CFG register in function set_ios.
The DMA operation in SDIO CMD53 may fail because the 4 bit SDIO mode
is not set up correctly on BF548.
Remove 2 blank lines as well.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/bfin_sdh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index 94fae2f1baaf..e62c5bc7fa31 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c | |||
@@ -391,6 +391,7 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
391 | /* Disable 4 bit SDIO */ | 391 | /* Disable 4 bit SDIO */ |
392 | cfg &= ~SD4E; | 392 | cfg &= ~SD4E; |
393 | } | 393 | } |
394 | bfin_write_SDH_CFG(cfg); | ||
394 | 395 | ||
395 | host->power_mode = ios->power_mode; | 396 | host->power_mode = ios->power_mode; |
396 | #ifndef RSI_BLKSZ | 397 | #ifndef RSI_BLKSZ |
@@ -415,7 +416,6 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
415 | cfg &= ~SD_CMD_OD; | 416 | cfg &= ~SD_CMD_OD; |
416 | # endif | 417 | # endif |
417 | 418 | ||
418 | |||
419 | if (ios->power_mode != MMC_POWER_OFF) | 419 | if (ios->power_mode != MMC_POWER_OFF) |
420 | cfg |= PWR_ON; | 420 | cfg |= PWR_ON; |
421 | else | 421 | else |
@@ -433,7 +433,6 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
433 | clk_ctl |= CLK_E; | 433 | clk_ctl |= CLK_E; |
434 | host->clk_div = clk_div; | 434 | host->clk_div = clk_div; |
435 | bfin_write_SDH_CLK_CTL(clk_ctl); | 435 | bfin_write_SDH_CLK_CTL(clk_ctl); |
436 | |||
437 | } else | 436 | } else |
438 | sdh_stop_clock(host); | 437 | sdh_stop_clock(host); |
439 | 438 | ||