64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
70 lines
2 KiB
Diff
70 lines
2 KiB
Diff
From bc70c7f1174b937af2784977281a1567f69dd2b6 Mon Sep 17 00:00:00 2001
|
|
From: Chaotian Jing <chaotian.jing@mediatek.com>
|
|
Date: Mon, 16 Oct 2017 09:46:31 +0800
|
|
Subject: [PATCH 152/224] mmc: mediatek: make hs400_tune_response only for
|
|
mt8173
|
|
|
|
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 | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/mtk-sd.c
|
|
+++ b/drivers/mmc/host/mtk-sd.c
|
|
@@ -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_ho
|
|
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 mm
|
|
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);
|