mmc: mediatek: make hs400_tune_response only for mt8173
authorChaotian Jing <chaotian.jing@mediatek.com>
Mon, 16 Oct 2017 01:46:31 +0000 (09:46 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 2 Nov 2017 14:20:23 +0000 (15:20 +0100)
the origin design of hs400_tune_response is for mt8173 because of
mt8173 has a special design. for doing that, we add a new member
"compatible", by now it's only for mt8173.

Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Tested-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mtk-sd.c

index 407745ab5c0a0c4adae437117b1e6a1044617166..a979e279148512c27b3481bccaa27e6adf73c632 100644 (file)
@@ -300,6 +300,7 @@ struct msdc_save_para {
 
 struct mtk_mmc_compatible {
        u8 clk_div_bits;
+       bool hs400_tune; /* only used for MT8173 */
 };
 
 struct msdc_tune_para {
@@ -360,18 +361,22 @@ struct msdc_host {
 
 static const struct mtk_mmc_compatible mt8135_compat = {
        .clk_div_bits = 8,
+       .hs400_tune = false,
 };
 
 static const struct mtk_mmc_compatible mt8173_compat = {
        .clk_div_bits = 8,
+       .hs400_tune = true,
 };
 
 static const struct mtk_mmc_compatible mt2701_compat = {
        .clk_div_bits = 12,
+       .hs400_tune = false,
 };
 
 static const struct mtk_mmc_compatible mt2712_compat = {
        .clk_div_bits = 12,
+       .hs400_tune = false,
 };
 
 static const struct of_device_id msdc_of_ids[] = {
@@ -666,7 +671,8 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
                       host->base + PAD_CMD_TUNE);
        }
 
-       if (timing == MMC_TIMING_MMC_HS400)
+       if (timing == MMC_TIMING_MMC_HS400 &&
+           host->dev_comp->hs400_tune)
                sdr_set_field(host->base + PAD_CMD_TUNE,
                              MSDC_PAD_TUNE_CMDRRDLY,
                              host->hs400_cmd_int_delay);
@@ -1594,7 +1600,8 @@ static int msdc_execute_tuning(struct mmc_host *mmc, u32 opcode)
        struct msdc_host *host = mmc_priv(mmc);
        int ret;
 
-       if (host->hs400_mode)
+       if (host->hs400_mode &&
+           host->dev_comp->hs400_tune)
                ret = hs400_tune_response(mmc, opcode);
        else
                ret = msdc_tune_response(mmc, opcode);