Merge branch 'master' of git://git.denx.de/u-boot-fdt

[u-boot] / drivers / mmc / mv_sdhci.c

diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 9e5995103c7da7e65d679ad2c85c7c55324991a9..2fe34b6993b8a8a006da4d0ae5704e1d1e0f66a7 100644 (file)
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -2,6 +2,33 @@
 #include <malloc.h>
 #include <sdhci.h>
 
+#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
+static struct sdhci_ops mv_ops;
+
+#if defined(CONFIG_SHEEVA_88SV331xV5)
+#define SD_CE_ATA_2    0xEA
+#define  MMC_CARD      0x1000
+#define  MMC_WIDTH     0x0100
+static inline void mv_sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
+{
+       struct mmc *mmc = host->mmc;
+       u32 ata = (u32)host->ioaddr + SD_CE_ATA_2;
+
+       if (!IS_SD(mmc) && reg == SDHCI_HOST_CONTROL) {
+               if (mmc->bus_width == 8)
+                       writew(readw(ata) | (MMC_CARD | MMC_WIDTH), ata);
+               else
+                       writew(readw(ata) & ~(MMC_CARD | MMC_WIDTH), ata);
+       }
+
+       writeb(val, host->ioaddr + reg);
+}
+
+#else
+#define mv_sdhci_writeb        NULL
+#endif /* CONFIG_SHEEVA_88SV331xV5 */
+#endif /* CONFIG_MMC_SDHCI_IO_ACCESSORS */
+
 static char *MVSDH_NAME = "mv_sdh";
 int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks)
 {
@@ -15,7 +42,15 @@ int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks)
        host->name = MVSDH_NAME;
        host->ioaddr = (void *)regbase;
        host->quirks = quirks;
-       host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
+#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
+       memset(&mv_ops, 0, sizeof(struct sdhci_ops));
+       mv_ops.write_b = mv_sdhci_writeb;
+       host->ops = &mv_ops;
+#endif
+       if (quirks & SDHCI_QUIRK_REG32_RW)
+               host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16;
+       else
+               host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
        add_sdhci(host, max_clk, min_clk);
        return 0;
 }