evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sdhci: Replace SDHCI_USE_ADMA_64BIT flag

Browse source 
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>
This commit is contained in:
Subhash Jadavani 2016-05-11 16:35:47 -07:00
parent e8032e07d1
commit a037c5f8a5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mmc/host/sdhci.c
View file

@ -1518,7 +1518,7 @@ static void sdhci_notify_halt(struct mmc_host *mmc, bool halt)
pr_debug("%s: halt notification was sent, halt=%d\n", pr_debug("%s: halt notification was sent, halt=%d\n",
mmc_hostname(mmc), halt); mmc_hostname(mmc), halt);
if (host->flags & SDHCI_USE_ADMA_64BIT) { if (host->flags & SDHCI_USE_64_BIT_DMA) {
if (halt) if (halt)
host->adma_desc_line_sz = 16; host->adma_desc_line_sz = 16;
else else
@ -4173,7 +4173,7 @@ int sdhci_add_host(struct sdhci_host *host)
} }
if (mmc->caps2 & MMC_CAP2_CMD_QUEUE) { 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; true : false;
ret = sdhci_cmdq_init(host, mmc, dma64); ret = sdhci_cmdq_init(host, mmc, dma64);
if (ret) if (ret)
@ -4186,7 +4186,7 @@ int sdhci_add_host(struct sdhci_host *host)
pr_info("%s: SDHCI controller on %s [%s] using %s in %s mode\n", 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)), mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
(host->flags & SDHCI_USE_ADMA) ? (host->flags & SDHCI_USE_ADMA) ?
((host->flags & SDHCI_USE_ADMA_64BIT) ? ((host->flags & SDHCI_USE_64_BIT_DMA) ?
"64-bit ADMA" : "32-bit ADMA") : "64-bit ADMA" : "32-bit ADMA") :
((host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"), ((host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"),
((mmc->caps2 & MMC_CAP2_CMD_QUEUE) && !ret) ? ((mmc->caps2 & MMC_CAP2_CMD_QUEUE) && !ret) ?

1
drivers/mmc/host/sdhci.h
View file

@ -531,7 +531,6 @@ struct sdhci_host {
#define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ #define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */
#define SDHCI_SDR104_NEEDS_TUNING (1<<10) /* SDR104/HS200 needs tuning */ #define SDHCI_SDR104_NEEDS_TUNING (1<<10) /* SDR104/HS200 needs tuning */
#define SDHCI_USE_64_BIT_DMA (1<<12) /* Use 64-bit DMA */ #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_HS400_TUNING (1<<13) /* Tuning for HS400 */
#define SDHCI_HOST_IRQ_STATUS (1<<14) /* host->irq status */ #define SDHCI_HOST_IRQ_STATUS (1<<14) /* host->irq status */