The patch titled
     sdhci-of: avoid writing reserved bits into host control register
has been removed from the -mm tree.  Its filename was
     sdhci-of-avoid-writing-reserved-bits-into-host-control-register.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: sdhci-of: avoid writing reserved bits into host control register
From: Anton Vorontsov <[email protected]>

SDHCI core tries to write HISPD bit into the host control register, but
the eSDHC controllers don't have that bit, and that causes all sorts of
misbehaviour when using 4-bit mode capable SD cards.

Signed-off-by: Anton Vorontsov <[email protected]>
Cc: Pierre Ossman <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: David Vrabel <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

 drivers/mmc/host/sdhci-of.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff -puN 
drivers/mmc/host/sdhci-of.c~sdhci-of-avoid-writing-reserved-bits-into-host-control-register
 drivers/mmc/host/sdhci-of.c
--- 
a/drivers/mmc/host/sdhci-of.c~sdhci-of-avoid-writing-reserved-bits-into-host-control-register
+++ a/drivers/mmc/host/sdhci-of.c
@@ -48,6 +48,8 @@ struct sdhci_of_host {
 #define ESDHC_CLOCK_HCKEN      0x00000002
 #define ESDHC_CLOCK_IPGEN      0x00000001
 
+#define ESDHC_HOST_CONTROL_RES 0x05
+
 static u32 esdhc_readl(struct sdhci_host *host, int reg)
 {
        return in_be32(host->ioaddr + reg);
@@ -109,6 +111,10 @@ static void esdhc_writeb(struct sdhci_ho
        int base = reg & ~0x3;
        int shift = (reg & 0x3) * 8;
 
+       /* Prevent SDHCI core from writing reserved bits (e.g. HISPD). */
+       if (reg == SDHCI_HOST_CONTROL)
+               val &= ~ESDHC_HOST_CONTROL_RES;
+
        clrsetbits_be32(host->ioaddr + base , 0xff << shift, val << shift);
 }
 
_

Patches currently in -mm which might be from [email protected] are

origin.patch
linux-next.patch
rtc-set-wakeup-capability-for-i2c-and-spi-rtc-drivers.patch

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to