From: Sonic Zhang <[email protected]> mmc core suspend and resume functions had already called sdh_set_ios with proper flags.
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- 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 fa085a0..57b7548 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c @@ -650,11 +650,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; @@ -676,16 +671,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); -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
