mmc: core: Add ->hs400_prepare_ddr() callback

Some eMMC controllers need specific settings for HS400 mode before the
speed mode can be switched to DDR mode, during the HS400 initialization
sequence. For that reason, let's introduce a new host callback,
->hs400_prepare_ddr() and invoked it just before switching to DDR mode.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index bc1bd2c256132c2f3def2844a7d5ccccb05ef523..4ff08ea930a61bb55c0246704b337cb3e36904c1 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1181,6 +1181,9 @@ static int mmc_select_hs400(struct mmc_card *card)
        if (err)
                goto out_err;
 
+       if (host->ops->hs400_prepare_ddr)
+               host->ops->hs400_prepare_ddr(host);
+
        /* Switch card to DDR */
        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                         EXT_CSD_BUS_WIDTH,

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 2a5fe75dd0821d03f7b8624d878ae457d6fe2ee9..2709c94d9d867c2b969c38fca9dd6657f9c072e7 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -147,6 +147,9 @@ struct mmc_host_ops {
        /* Prepare HS400 target operating frequency depending host driver */
        int     (*prepare_hs400_tuning)(struct mmc_host *host, struct mmc_ios *ios);
 
+       /* Prepare switch to DDR during the HS400 init sequence */
+       int     (*hs400_prepare_ddr)(struct mmc_host *host);
+
        /* Prepare for switching from HS400 to HS200 */
        void    (*hs400_downgrade)(struct mmc_host *host);