From: Sonic Zhang <sonic.adi@gmail.com>
To: Chris Ball <cjb@laptop.org>
Cc: linux-mmc@vger.kernel.org, Bob Liu <liubbo@gmail.com>,
uclinux-dist-devel@blackfin.uclinux.org,
Sonic Zhang <sonic.zhang@analog.com>, Bob Liu <lliubbo@gmail.com>
Subject: [PATCH 3/4] mmc: bfin_sdh: Remove redundent suspend and resume setting.
Date: Tue, 7 Aug 2012 11:10:14 +0800 [thread overview]
Message-ID: <1344309015-13248-3-git-send-email-sonic.adi@gmail.com> (raw)
In-Reply-To: <1344309015-13248-1-git-send-email-sonic.adi@gmail.com>
From: Sonic Zhang <sonic.zhang@analog.com>
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>
---
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
next prev parent reply other threads:[~2012-08-07 3:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 3:10 [PATCH 1/4] mmc: bfin_sdh: limit mmc DMA segment len to 1 for bf518 Sonic Zhang
2012-08-07 3:10 ` [PATCH 2/4] mmc: bfin_sdh: Port bf5xx SD host driver to support new RSI controller in bf60x Sonic Zhang
2012-08-08 4:15 ` Chris Ball
2012-08-07 3:10 ` Sonic Zhang [this message]
2012-08-08 4:20 ` [PATCH 3/4] mmc: bfin_sdh: Remove redundent suspend and resume setting Chris Ball
2012-08-07 3:10 ` [PATCH 4/4] mmc: bfin_sdh: Reset SD controller when resume from power saving mode Sonic Zhang
2012-08-08 4:20 ` Chris Ball
2012-08-08 3:23 ` [PATCH 1/4] mmc: bfin_sdh: limit mmc DMA segment len to 1 for bf518 Sonic Zhang
2012-08-08 3:31 ` Chris Ball
[not found] ` <87zk66vz45.fsf-DGHOrqG7t0YzNDMTQreKSUB+6BGkLq7r@public.gmane.org>
2012-08-08 3:36 ` Chris Ball
2012-08-08 3:40 ` Zhang, Sonic
2012-08-08 3:39 ` Zhang, Sonic
2012-08-08 3:42 ` Chris Ball
2012-08-08 4:11 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344309015-13248-3-git-send-email-sonic.adi@gmail.com \
--to=sonic.adi@gmail.com \
--cc=cjb@laptop.org \
--cc=linux-mmc@vger.kernel.org \
--cc=liubbo@gmail.com \
--cc=lliubbo@gmail.com \
--cc=sonic.zhang@analog.com \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox