| Message ID | 1507548926-9555-6-git-send-email-chaotian.jing@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/09/2017 01:35 PM, Chaotian Jing wrote: > 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> > --- > drivers/mmc/host/mtk-sd.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 643c795..e8f8ad9 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -317,6 +317,7 @@ struct msdc_delay_phase { > struct msdc_host { > struct device *dev; > const struct mtk_mmc_compatible *dev_comp; > + const char *compatible; > struct mmc_host *mmc; /* mmc structure */ > int cmd_rsp; > > @@ -666,7 +667,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 && > + !strcmp(host->compatible, "mediatek,mt8173-mmc")) You can add another value to mtk_mmc_compatible as you did in all the following patches. Regards, Matthias > sdr_set_field(host->base + PAD_CMD_TUNE, > MSDC_PAD_TUNE_CMDRRDLY, > host->hs400_cmd_int_delay); > @@ -1594,7 +1596,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 && > + !strcmp(host->compatible, "mediatek,mt8173-mmc")) > ret = hs400_tune_response(mmc, opcode); > else > ret = msdc_tune_response(mmc, opcode); > @@ -1745,6 +1748,7 @@ static int msdc_drv_probe(struct platform_device *pdev) > > host->dev = &pdev->dev; > host->dev_comp = of_id->data; > + host->compatible = of_id->compatible; > host->mmc = mmc; > host->src_clk_freq = clk_get_rate(host->src_clk); > /* Set host parameters to mmc */ > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2017-10-09 at 16:58 +0200, Matthias Brugger wrote: > > On 10/09/2017 01:35 PM, Chaotian Jing wrote: > > 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> > > --- > > drivers/mmc/host/mtk-sd.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 643c795..e8f8ad9 100644 > > --- a/drivers/mmc/host/mtk-sd.c > > +++ b/drivers/mmc/host/mtk-sd.c > > @@ -317,6 +317,7 @@ struct msdc_delay_phase { > > struct msdc_host { > > struct device *dev; > > const struct mtk_mmc_compatible *dev_comp; > > + const char *compatible; > > struct mmc_host *mmc; /* mmc structure */ > > int cmd_rsp; > > > > @@ -666,7 +667,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 && > > + !strcmp(host->compatible, "mediatek,mt8173-mmc")) > > You can add another value to mtk_mmc_compatible as you did in all the following > patches. Ok, will do that at next version. > > Regards, > Matthias > > > sdr_set_field(host->base + PAD_CMD_TUNE, > > MSDC_PAD_TUNE_CMDRRDLY, > > host->hs400_cmd_int_delay); > > @@ -1594,7 +1596,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 && > > + !strcmp(host->compatible, "mediatek,mt8173-mmc")) > > ret = hs400_tune_response(mmc, opcode); > > else > > ret = msdc_tune_response(mmc, opcode); > > @@ -1745,6 +1748,7 @@ static int msdc_drv_probe(struct platform_device *pdev) > > > > host->dev = &pdev->dev; > > host->dev_comp = of_id->data; > > + host->compatible = of_id->compatible; > > host->mmc = mmc; > > host->src_clk_freq = clk_get_rate(host->src_clk); > > /* Set host parameters to mmc */ > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 643c795..e8f8ad9 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -317,6 +317,7 @@ struct msdc_delay_phase { struct msdc_host { struct device *dev; const struct mtk_mmc_compatible *dev_comp; + const char *compatible; struct mmc_host *mmc; /* mmc structure */ int cmd_rsp; @@ -666,7 +667,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 && + !strcmp(host->compatible, "mediatek,mt8173-mmc")) sdr_set_field(host->base + PAD_CMD_TUNE, MSDC_PAD_TUNE_CMDRRDLY, host->hs400_cmd_int_delay); @@ -1594,7 +1596,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 && + !strcmp(host->compatible, "mediatek,mt8173-mmc")) ret = hs400_tune_response(mmc, opcode); else ret = msdc_tune_response(mmc, opcode); @@ -1745,6 +1748,7 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dev = &pdev->dev; host->dev_comp = of_id->data; + host->compatible = of_id->compatible; host->mmc = mmc; host->src_clk_freq = clk_get_rate(host->src_clk); /* Set host parameters to mmc */
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> --- drivers/mmc/host/mtk-sd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)