>From 9b08f7f484aa41a627176b6ef6448edb2e235234 Mon Sep 17 00:00:00 2001
From: Denis Robert <[email protected]>
Date: Wed, 20 Oct 2010 12:41:09 +0200
Subject: [PATCH 15/26] mmc: sdio: fully reconfigure oldcard on resume

On resume, let mmc_sdio_init_card go all the way, instead
of skipping the reconfiguration of the card's speed and width.

This is needed to ensure cards wake up with their clock
reconfigured (otherwise it's kept low).

This patch also removes the explicit bus width reconfiguration
on resume, since now this is part of mmc_sdio_init_card.

Signed-off-by: Ohad Ben-Cohen <[email protected]>
Signed-off-by: Denis Robert <[email protected]>
Signed-off-by: Claude Brouat <[email protected]>
---
 drivers/mmc/core/sdio.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index b9dee28..645f173 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -344,7 +344,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 
ocr,
                goto err;
           }
           card = oldcard;
-          return 0;
     }

     /*
@@ -487,9 +486,6 @@ static int mmc_sdio_resume(struct mmc_host *host)
     mmc_claim_host(host);
     err = mmc_sdio_init_card(host, host->ocr, host->card,
                      (host->pm_flags & MMC_PM_KEEP_POWER));
-    if (!err)
-          /* We may have switched to 1-bit mode during suspend. */
-          err = sdio_enable_wide(host->card);
     if (!err && host->sdio_irqs)
           mmc_signal_sdio_irq(host);
     mmc_release_host(host);
--
1.6.3.3




Claude BROUAT
UMG/MIPE/WSIV  System Integrator
Office:    +33 (0)1 72 21 04 54
mailto: mailto:[email protected]

Intel Corp. SAS
134, av du Général Eisenhower
BP 73586
31100 TOULOUSE
France



---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris, 
92196 Meudon Cedex, France
Registration Number:  302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Attachment: 0015-mmc-sdio-fully-reconfigure-oldcard-on-resume.patch
Description: 0015-mmc-sdio-fully-reconfigure-oldcard-on-resume.patch

_______________________________________________
Meego-kernel mailing list
[email protected]
http://lists.meego.com/listinfo/meego-kernel

Reply via email to