mmc: sdhci: Replace SDHCI_USE_ADMA_64BIT flag
SDHCI_USE_ADMA_64BIT flag was being used by msm-3.18 kernel but now that
upstream sdhci driver has introduced support for 64-bit ADMA, it defined
new flag SDHCI_USE_64_BIT_DMA. Hence replace all the SDHCI_USE_ADMA_64BIT
references with SDHCI_USE_64_BIT_DMA flag.
Change-Id: I6a1e426c156d4ddb92bba00b5ec0cfb156d9550b
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
[xiaonian@codeaurora.org: fixed trivial merge conflict]
Signed-off-by: Xiaonian Wang <xiaonian@codeaurora.org>
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 028faad..0001be198 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1656,7 +1656,7 @@
pr_debug("%s: halt notification was sent, halt=%d\n",
mmc_hostname(mmc), halt);
- if (host->flags & SDHCI_USE_ADMA_64BIT) {
+ if (host->flags & SDHCI_USE_64_BIT_DMA) {
if (halt)
host->adma_desc_line_sz = 16;
else
@@ -4323,7 +4323,7 @@
}
if (mmc->caps2 & MMC_CAP2_CMD_QUEUE) {
- bool dma64 = (host->flags & SDHCI_USE_ADMA_64BIT) ?
+ bool dma64 = (host->flags & SDHCI_USE_64_BIT_DMA) ?
true : false;
ret = sdhci_cmdq_init(host, mmc, dma64);
if (ret)
@@ -4336,7 +4336,7 @@
pr_info("%s: SDHCI controller on %s [%s] using %s in %s mode\n",
mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
(host->flags & SDHCI_USE_ADMA) ?
- ((host->flags & SDHCI_USE_ADMA_64BIT) ?
+ ((host->flags & SDHCI_USE_64_BIT_DMA) ?
"64-bit ADMA" : "32-bit ADMA") :
((host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"),
((mmc->caps2 & MMC_CAP2_CMD_QUEUE) && !ret) ?
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 62dccda..5269455 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -537,7 +537,6 @@
#define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */
#define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */
#define SDHCI_USE_64_BIT_DMA (1<<12) /* Use 64-bit DMA */
-#define SDHCI_USE_ADMA_64BIT (1<<12) /* Host is 64-bit ADMA capable */
#define SDHCI_HS400_TUNING (1<<13) /* Tuning for HS400 */
#define SDHCI_SIGNALING_330 (1<<14) /* Host is capable of 3.3V signaling */
#define SDHCI_SIGNALING_180 (1<<15) /* Host is capable of 1.8V signaling */