diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2018-02-14 08:57:44 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-05 07:04:31 -0500 |
commit | 7b7d57fd1b773d25d8358c6017592b4928bf76ce (patch) | |
tree | f2e67304c95deed69c4d055993fe5c9211f956e3 | |
parent | 129d21ce15af027696864b2798b41f4514f1c8c2 (diff) |
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: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/sdhci-pci-core.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 82c4f05f91d8..ce21d86a8141 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c | |||
@@ -712,26 +712,8 @@ static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot) | |||
712 | return ret; | 712 | return ret; |
713 | } | 713 | } |
714 | 714 | ||
715 | static void glk_cqe_enable(struct mmc_host *mmc) | ||
716 | { | ||
717 | struct sdhci_host *host = mmc_priv(mmc); | ||
718 | u32 reg; | ||
719 | |||
720 | /* | ||
721 | * CQE gets stuck if it sees Buffer Read Enable bit set, which can be | ||
722 | * the case after tuning, so ensure the buffer is drained. | ||
723 | */ | ||
724 | reg = sdhci_readl(host, SDHCI_PRESENT_STATE); | ||
725 | while (reg & SDHCI_DATA_AVAILABLE) { | ||
726 | sdhci_readl(host, SDHCI_BUFFER); | ||
727 | reg = sdhci_readl(host, SDHCI_PRESENT_STATE); | ||
728 | } | ||
729 | |||
730 | sdhci_cqe_enable(mmc); | ||
731 | } | ||
732 | |||
733 | static const struct cqhci_host_ops glk_cqhci_ops = { | 715 | static const struct cqhci_host_ops glk_cqhci_ops = { |
734 | .enable = glk_cqe_enable, | 716 | .enable = sdhci_cqe_enable, |
735 | .disable = sdhci_cqe_disable, | 717 | .disable = sdhci_cqe_disable, |
736 | .dumpregs = sdhci_pci_dumpregs, | 718 | .dumpregs = sdhci_pci_dumpregs, |
737 | }; | 719 | }; |