12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667 |
- From 788d269aee4c612d5cd97b896ea5d22f19137097 Mon Sep 17 00:00:00 2001
- From: Chaotian Jing <[email protected]>
- Date: Mon, 16 Oct 2017 09:46:34 +0800
- Subject: [PATCH 155/224] mmc: mediatek: add busy_check support
- bit7 of PATCH_BIT1 has different meaning in new design, to
- compatible with previous platform, clear this bit in new
- platform.
- Signed-off-by: Chaotian Jing <[email protected]>
- Tested-by: Sean Wang <[email protected]>
- Signed-off-by: Ulf Hansson <[email protected]>
- ---
- drivers/mmc/host/mtk-sd.c | 7 +++++++
- 1 file changed, 7 insertions(+)
- --- a/drivers/mmc/host/mtk-sd.c
- +++ b/drivers/mmc/host/mtk-sd.c
- @@ -316,6 +316,7 @@ struct mtk_mmc_compatible {
- u32 pad_tune_reg;
- bool async_fifo;
- bool data_tune;
- + bool busy_check;
- };
-
- struct msdc_tune_para {
- @@ -380,6 +381,7 @@ static const struct mtk_mmc_compatible m
- .pad_tune_reg = MSDC_PAD_TUNE,
- .async_fifo = false,
- .data_tune = false,
- + .busy_check = false,
- };
-
- static const struct mtk_mmc_compatible mt8173_compat = {
- @@ -388,6 +390,7 @@ static const struct mtk_mmc_compatible m
- .pad_tune_reg = MSDC_PAD_TUNE,
- .async_fifo = false,
- .data_tune = false,
- + .busy_check = false,
- };
-
- static const struct mtk_mmc_compatible mt2701_compat = {
- @@ -396,6 +399,7 @@ static const struct mtk_mmc_compatible m
- .pad_tune_reg = MSDC_PAD_TUNE0,
- .async_fifo = true,
- .data_tune = true,
- + .busy_check = false,
- };
-
- static const struct mtk_mmc_compatible mt2712_compat = {
- @@ -404,6 +408,7 @@ static const struct mtk_mmc_compatible m
- .pad_tune_reg = MSDC_PAD_TUNE0,
- .async_fifo = true,
- .data_tune = true,
- + .busy_check = true,
- };
-
- static const struct of_device_id msdc_of_ids[] = {
- @@ -1275,6 +1280,8 @@ static void msdc_init_hw(struct msdc_hos
- sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1);
- writel(0xffff4089, host->base + MSDC_PATCH_BIT1);
- sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL);
- + if (host->dev_comp->busy_check)
- + sdr_clr_bits(host->base + MSDC_PATCH_BIT1, (1 << 7));
- if (host->dev_comp->async_fifo) {
- sdr_set_field(host->base + MSDC_PATCH_BIT2,
- MSDC_PB2_RESPWAIT, 3);
|