Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acde28c4 authored by Chaotian Jing's avatar Chaotian Jing Committed by Ulf Hansson
Browse files

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: default avatarChaotian Jing <chaotian.jing@mediatek.com>
Tested-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2fea5819

drivers/mmc/host/mtk-sd.c

+7 −0
Original line number Diff line number Diff line
@@ -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 mt8135_compat = { 
	.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 mt8173_compat = { 
	.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 mt2701_compat = { 
	.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 mt2712_compat = { 
	.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_host *host) 
	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);