[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1339665743-7947-4-git-send-email-sonic.adi@gmail.com>
Date: Thu, 14 Jun 2012 17:22:22 +0800
From: Sonic Zhang <sonic.adi@...il.com>
To: Chris Ball <cjb@...top.org>, <linux-mmc@...r.kernel.org>
CC: LKML <linux-kernel@...r.kernel.org>,
<uclinux-dist-devel@...ckfin.uclinux.org>,
Sonic Zhang <sonic.zhang@...log.com>,
Bob Liu <lliubbo@...il.com>
Subject: [PATCH 4/5 v2] mmc: bfin_sdh: Remove redundent suspend and resume setting.
From: Sonic Zhang <sonic.zhang@...log.com>
mmc core suspend and resume functions had already called sdh_set_ios with proper flags.
Signed-off-by: Sonic Zhang <sonic.zhang@...log.com>
Signed-off-by: Bob Liu <lliubbo@...il.com>
---
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 f47526f..7776614 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);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists