mmc: sdhci-of-esdhc: add tuning support

eSDHC uses tuning block for tuning procedure. So the tuning
block control register must be configured properly before tuning.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h
index 68695679fed5ccbe0988253c51b60e3c029e3808..c4bbd7485987907778bb6d146229c22111f1b14a 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc.h
+++ b/drivers/mmc/host/sdhci-esdhc.h
@@ -53,9 +53,14 @@
 #define ESDHC_CLOCK_HCKEN              0x00000002
 #define ESDHC_CLOCK_IPGEN              0x00000001
 
+/* Tuning Block Control Register */
+#define ESDHC_TBCTL                    0x120
+#define ESDHC_TB_EN                    0x00000004
+
 /* Control Register for DMA transfer */
 #define ESDHC_DMA_SYSCTL               0x40c
 #define ESDHC_PERIPHERAL_CLK_SEL       0x00080000
+#define ESDHC_FLUSH_ASYNC_FIFO         0x00040000
 #define ESDHC_DMA_SNOOP                        0x00000040
 
 #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index f2d7002e37c12fb343a23aef894efc84cffe7d03..607e5122e1a136870554405326877c9c829749a7 100644 (file)
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -631,6 +631,25 @@ static int esdhc_signal_voltage_switch(struct mmc_host *mmc,
        }
 }
 
+static int esdhc_execute_tuning(struct mmc_host *mmc, u32 opcode)
+{
+       struct sdhci_host *host = mmc_priv(mmc);
+       u32 val;
+
+       /* Use tuning block for tuning procedure */
+       esdhc_clock_enable(host, false);
+       val = sdhci_readl(host, ESDHC_DMA_SYSCTL);
+       val |= ESDHC_FLUSH_ASYNC_FIFO;
+       sdhci_writel(host, val, ESDHC_DMA_SYSCTL);
+
+       val = sdhci_readl(host, ESDHC_TBCTL);
+       val |= ESDHC_TB_EN;
+       sdhci_writel(host, val, ESDHC_TBCTL);
+       esdhc_clock_enable(host, true);
+
+       return sdhci_execute_tuning(mmc, opcode);
+}
+
 #ifdef CONFIG_PM_SLEEP
 static u32 esdhc_proctl;
 static int esdhc_of_suspend(struct device *dev)
@@ -790,6 +809,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
 
        host->mmc_host_ops.start_signal_voltage_switch =
                esdhc_signal_voltage_switch;
+       host->mmc_host_ops.execute_tuning = esdhc_execute_tuning;
 
        esdhc_init(pdev, host);