mmc: mediatek: add pre_enable() and post_disable() hook function (e282f204) · Commits · 戴 / test

CQHCI_ENABLE bit in CQHCI_CFG should be disabled after msdc_cqe_disable(), and should be enabled before msdc_ceq_enable() for MTK platform. Add hook functions for cqhci_host_ops->pre_enable() and cqhci_host_ops->post_disable(). Signed-off-by:

Chun-Hung Wu <chun-hung.wu@mediatek.com> Acked-by:

Adrian Hunter <adrian.hunter@intel.com> Link: https://lore.kernel.org/r/1598520783-25250-3-git-send-email-chun-hung.wu@mediatek.com Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/mtk-sd.c

+22 −0

Original line number	Diff line number	Diff line
		@@ -2290,6 +2290,26 @@ static void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)
		}
		}

		static void msdc_cqe_pre_enable(struct mmc_host *mmc)
		{
		struct cqhci_host *cq_host = mmc->cqe_private;
		u32 reg;

		reg = cqhci_readl(cq_host, CQHCI_CFG);
		reg \|= CQHCI_ENABLE;
		cqhci_writel(cq_host, reg, CQHCI_CFG);
		}

		static void msdc_cqe_post_disable(struct mmc_host *mmc)
		{
		struct cqhci_host *cq_host = mmc->cqe_private;
		u32 reg;

		reg = cqhci_readl(cq_host, CQHCI_CFG);
		reg &= ~CQHCI_ENABLE;
		cqhci_writel(cq_host, reg, CQHCI_CFG);
		}

		static const struct mmc_host_ops mt_msdc_ops = {
		.post_req = msdc_post_req,
		.pre_req = msdc_pre_req,
		@@ -2309,6 +2329,8 @@ static const struct mmc_host_ops mt_msdc_ops = {
		static const struct cqhci_host_ops msdc_cmdq_ops = {
		.enable = msdc_cqe_enable,
		.disable = msdc_cqe_disable,
		.pre_enable = msdc_cqe_pre_enable,
		.post_disable = msdc_cqe_post_disable,
		};

		static void msdc_of_property_parse(struct platform_device *pdev,

Admin message