powerpc/corenet: enable eSDHC

[Lu Y.B.]

Thanks a lot, Scott.
And now a patch was merged on git://git.linaro.org/people/ulf.hansson/mmc.git next branch to fix this issue.
It should be no problem.


>From 5fd26c7ecb32082745b0bd33c8e35badd1cb5a91 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson at linaro.org>
Date: Fri, 5 Jun 2015 11:40:08 +0200
Subject: [PATCH] mmc: sdhci: Restore behavior while creating OCR mask

Commit 3a48edc4bd68 ("mmc: sdhci: Use mmc core regulator infrastucture")
changed the behavior for how to assign the ocr_avail mask for the mmc
host. More precisely it started to mask the bits instead of assigning
them.

Restore the behavior, but also make it clear that an OCR mask created
from an external regulator overrides the other ones. The OCR mask is
determined by one of the following with this priority:

1. Supported ranges of external regulator if one supplies VDD
2. Host OCR mask if set by the driver (based on DT properties)
3. The capabilities reported by the controller itself

Fixes: 3a48edc4bd68 ("mmc: sdhci: Use mmc core regulator infrastucture")
Cc: Tim Kryger <tim.kryger at gmail.com>
Reported-by: Yangbo Lu <yangbo.lu at freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
Reviewed-by: Tim Kryger <tim.kryger at gmail.com>
---
 drivers/mmc/host/sdhci.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 1b4861d..706bb60 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3256,13 +3256,14 @@ int sdhci_add_host(struct sdhci_host *host)
 				   SDHCI_MAX_CURRENT_MULTIPLIER;
 	}
 
-	/* If OCR set by external regulators, use it instead */
+	/* If OCR set by host, use it instead. */
+	if (host->ocr_mask)
+		ocr_avail = host->ocr_mask;
+
+	/* If OCR set by external regulators, give it highest prio. */
 	if (mmc->ocr_avail)
 		ocr_avail = mmc->ocr_avail;
 
-	if (host->ocr_mask)
-		ocr_avail &= host->ocr_mask;
-
 	mmc->ocr_avail = ocr_avail;
 	mmc->ocr_avail_sdio = ocr_avail;
 	if (host->ocr_avail_sdio)
-- 
2.1.0.27.g96db324



Best regards,
Yangbo Lu


> -----Original Message-----
> From: Wood Scott-B07421
> Sent: Saturday, May 30, 2015 8:04 AM
> To: Lu Yangbo-B47093
> Cc: linuxppc-dev at lists.ozlabs.org; linux-mmc at vger.kernel.org
> Subject: Re: powerpc/corenet: enable eSDHC
> 
> On Wed, May 06, 2015 at 02:29:08PM +0800, Yangbo Lu wrote:
> > Signed-off-by: Yangbo Lu <yangbo.lu at freescale.com>
> > ---
> >  arch/powerpc/configs/corenet32_smp_defconfig | 2 ++
> > arch/powerpc/configs/corenet64_smp_defconfig | 2 ++
> >  2 files changed, 4 insertions(+)
> >
> > diff --git a/arch/powerpc/configs/corenet32_smp_defconfig
> > b/arch/powerpc/configs/corenet32_smp_defconfig
> > index ca7957b..17fb2e0 100644
> > --- a/arch/powerpc/configs/corenet32_smp_defconfig
> > +++ b/arch/powerpc/configs/corenet32_smp_defconfig
> > @@ -130,6 +130,8 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
> > CONFIG_USB_STORAGE=y  CONFIG_MMC=y  CONFIG_MMC_SDHCI=y
> > +CONFIG_MMC_SDHCI_PLTFM=y
> > +CONFIG_MMC_SDHCI_OF_ESDHC=y
> >  CONFIG_EDAC=y
> >  CONFIG_EDAC_MM_EDAC=y
> >  CONFIG_EDAC_MPC85XX=y
> > diff --git a/arch/powerpc/configs/corenet64_smp_defconfig
> > b/arch/powerpc/configs/corenet64_smp_defconfig
> > index 04737aa..4605a55 100644
> > --- a/arch/powerpc/configs/corenet64_smp_defconfig
> > +++ b/arch/powerpc/configs/corenet64_smp_defconfig
> > @@ -112,6 +112,8 @@ CONFIG_USB_EHCI_FSL=y  CONFIG_USB_STORAGE=y
> > CONFIG_MMC=y  CONFIG_MMC_SDHCI=y
> > +CONFIG_MMC_SDHCI_PLTFM=y
> > +CONFIG_MMC_SDHCI_OF_ESDHC=y
> >  CONFIG_EDAC=y
> >  CONFIG_EDAC_MM_EDAC=y
> >  CONFIG_RTC_CLASS=y
> 
> With this on t4240rdb I'm continually spammed with:
> sdhci-esdhc ffe114000.sdhc: no support for card's volts
> mmc0: error -22 whilst initialising SD card sdhci-esdhc ffe114000.sdhc:
> no support for card's volts
> mmc0: error -22 whilst initialising SD card
> 
> Releveant boot messages include:
> sdhci: Secure Digital Host Controller Interface driver
> sdhci: Copyright(c) Pierre Ossman
> sdhci-pltfm: SDHCI platform and OF driver helper sdhci-esdhc
> ffe114000.sdhc: No vmmc regulator found sdhci-esdhc ffe114000.sdhc: No
> vqmmc regulator found
> mmc0: SDHCI controller on ffe114000.sdhc [ffe114000.sdhc] using ADMA ...
> mmc0: error -22 whilst initialising SD card ...
> sdhci-esdhc ffe114000.sdhc: no support for card's volts
> mmc0: error -22 whilst initialising SD card
> 
> -Scott