[PATCH RESEND] sdhci: Enable high speed support for MMC cards

[Chris Ball <cjb@laptop.org>]

On Mon, Aug 30, 2010 at 10:34:48AM +0900, Kyungmin Park wrote:
> right, it's required patch and should be merged at this rc window.

Okay.  Andrew, would you mind sending the patch below to Linus for
-rc4?  (If you'd rather it go through someone else, that's fine.)

> > -       if (ios->timing == MMC_TIMING_SD_HS &&
> > +       if ((ios->timing == MMC_TIMING_SD_HS ||
> > +            ios->timing == MMC_TIMING_MMC_HS) &&
> >            !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT))
> >                ctrl |= SDHCI_CTRL_HISPD;
> >        else
> >
> Does it need? I mean when probing the mmc card it doesn't have
> MMC_TIMING_MMC_HS. so it can't trigger the this condition at my
> environment.

I agree; MMC_TIMING_MMC_HS is set in response to moving to HS, which
can't happen without this flag.  George, let us know if you still 
think this is necessary.

Here's Zhangfei's patch for merging:

From: Zhangfei Gao <zgao6@marvell.com>
Date: Mon, 16 Aug 2010 21:15:32 -0400
Subject: [PATCH] sdhci: Enable high-speed support for MMC cards

Support MMC_CAP_MMC_HIGHSPEED.

Signed-off-by: Zhangfei Gao <zgao6@marvell.com>
Acked-by: Matt Fleming <matt@console-pimps.org>
Acked-by: Kyungmin Park <kmpark@infradead.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
---
 drivers/mmc/host/sdhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 401527d..87ab234 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1824,7 +1824,7 @@ int sdhci_add_host(struct sdhci_host *host)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
 
 	if (caps & SDHCI_CAN_DO_HISPD)
-		mmc->caps |= MMC_CAP_SD_HIGHSPEED;
+		mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
 
 	if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
 		mmc->caps |= MMC_CAP_NEEDS_POLL;
-- 
1.7.0.1

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child