Commit 7b7d57fd authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Get rid of glk_cqe_enable() 



Now that tuning no longer leaves the Buffer Read Enable bit set (refer
intel_execute_tuning()), glk_cqe_enable() is no longer needed. Get rid of
it.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 129d21ce

drivers/mmc/host/sdhci-pci-core.c

+1 −19
Original line number Diff line number Diff line
@@ -712,26 +712,8 @@ static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot) 
	return ret;

}



static void glk_cqe_enable(struct mmc_host *mmc)

{

	struct sdhci_host *host = mmc_priv(mmc);

	u32 reg;



	/*

	 * CQE gets stuck if it sees Buffer Read Enable bit set, which can be

	 * the case after tuning, so ensure the buffer is drained.

	 */

	reg = sdhci_readl(host, SDHCI_PRESENT_STATE);

	while (reg & SDHCI_DATA_AVAILABLE) {

		sdhci_readl(host, SDHCI_BUFFER);

		reg = sdhci_readl(host, SDHCI_PRESENT_STATE);

	}



	sdhci_cqe_enable(mmc);

}



static const struct cqhci_host_ops glk_cqhci_ops = {

	.enable		= glk_cqe_enable,

	.enable		= sdhci_cqe_enable,

	.disable	= sdhci_cqe_disable,

	.dumpregs	= sdhci_pci_dumpregs,

};