aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2012-08-08 00:14:26 -0400
committerChris Ball <cjb@laptop.org>2012-09-04 13:58:19 -0400
commitc5e4a2e4c6fe47d88a1b172e54ed47a463f0ce45 (patch)
tree4e08437df4301ab5bf590e4c0ffcf553edc9ad2b
parent4ffdcf0469f1e7e47476ee410e8dfbc6aba61b65 (diff)
mmc: bfin_sdh: Remove redundant suspend and resume setting.
mmc core suspend and resume functions had already called sdh_set_ios with proper flags. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/bfin_sdh.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index f47526f09271..7776614fb2a5 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -643,11 +643,6 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state)
643 if (mmc) 643 if (mmc)
644 ret = mmc_suspend_host(mmc); 644 ret = mmc_suspend_host(mmc);
645 645
646#ifndef RSI_BLKSZ
647 bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);
648#else
649 bfin_write_SDH_CFG(bfin_read_SDH_CFG() & ~PWR_ON);
650#endif
651 peripheral_free_list(drv_data->pin_req); 646 peripheral_free_list(drv_data->pin_req);
652 647
653 return ret; 648 return ret;
@@ -669,16 +664,6 @@ static int sdh_resume(struct platform_device *dev)
669 /* Secure Digital Host shares DMA with Nand controller */ 664 /* Secure Digital Host shares DMA with Nand controller */
670 bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1); 665 bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
671#endif 666#endif
672#ifndef RSI_BLKSZ
673 bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() | PWR_ON);
674 bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);
675#else
676 bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN | PWR_ON);
677#endif
678 SSYNC();
679
680 bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
681 SSYNC();
682 667
683 if (mmc) 668 if (mmc)
684 ret = mmc_resume_host(mmc); 669 ret = mmc_resume_host(mmc);