diff options
| author | Sonic Zhang | 2012-08-08 06:14:26 +0200 |
|---|---|---|
| committer | Chris Ball | 2012-09-04 19:58:19 +0200 |
| commit | c5e4a2e4c6fe47d88a1b172e54ed47a463f0ce45 (patch) | |
| tree | 4e08437df4301ab5bf590e4c0ffcf553edc9ad2b /drivers/mmc/host/bfin_sdh.c | |
| parent | mmc: bfin_sdh: Add support for new RSI controller in bf60x (diff) | |
| download | kernel-qcow2-linux-c5e4a2e4c6fe47d88a1b172e54ed47a463f0ce45.tar.gz kernel-qcow2-linux-c5e4a2e4c6fe47d88a1b172e54ed47a463f0ce45.tar.xz kernel-qcow2-linux-c5e4a2e4c6fe47d88a1b172e54ed47a463f0ce45.zip | |
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>
Diffstat (limited to 'drivers/mmc/host/bfin_sdh.c')
| -rw-r--r-- | drivers/mmc/host/bfin_sdh.c | 15 |
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) if (mmc) ret = mmc_suspend_host(mmc); -#ifndef RSI_BLKSZ - bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON); -#else - bfin_write_SDH_CFG(bfin_read_SDH_CFG() & ~PWR_ON); -#endif peripheral_free_list(drv_data->pin_req); return ret; @@ -669,16 +664,6 @@ static int sdh_resume(struct platform_device *dev) /* Secure Digital Host shares DMA with Nand controller */ bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1); #endif -#ifndef RSI_BLKSZ - bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() | PWR_ON); - bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN); -#else - bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN | PWR_ON); -#endif - SSYNC(); - - bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3)); - SSYNC(); if (mmc) ret = mmc_resume_host(mmc); |