mmc: meson-gx: disable HS400

At the moment, all our attempts to enable HS400 on Amlogic chipsets have
been unsuccessful or unreliable. Until we can figure out how to enable this
mode safely and reliably, let's force it off.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 3df50b53f83419eab0f4dcbfc1c3ac8696b907a5..118f09da8dfbc34fb6afdacb920afadbad7665a4 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -823,10 +823,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        if (meson_mmc_timing_is_ddr(ios))
                val |= CFG_DDR;
 
-       val &= ~CFG_CHK_DS;
-       if (ios->timing == MMC_TIMING_MMC_HS400)
-               val |= CFG_CHK_DS;
-
        err = meson_mmc_clk_set(host, ios);
        if (err)
                dev_err(host->dev, "Failed to set clock: %d\n,", err);
@@ -1339,6 +1335,13 @@ static int meson_mmc_probe(struct platform_device *pdev)
        mmc->max_segs = SD_EMMC_DESC_BUF_LEN / sizeof(struct sd_emmc_desc);
        mmc->max_seg_size = mmc->max_req_size;
 
+       /*
+        * At the moment, we don't know how to reliably enable HS400.
+        * From the different datasheets, it is not even clear if this mode
+        * is officially supported by any of the SoCs
+        */
+       mmc->caps2 &= ~MMC_CAP2_HS400;
+
        /* data bounce buffer */
        host->bounce_buf_size = mmc->max_req_size;
        host->bounce_buf =