diff options
| author | Pavan Anamula <pavana@codeaurora.org> | 2015-07-22 18:17:32 +0530 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-31 15:27:07 -0700 |
| commit | b7b3cd3406a1b16194a8df3e999aef85cb7e91c4 (patch) | |
| tree | 1792e10baefcfb0ef5d1143201376bf9e4ac93fa /drivers/mmc | |
| parent | 7a14825b8e8e897b9f81107197b413ce09b298be (diff) | |
mmc: sdhci-msm: Setting coherent_dma_mask
Set coherent_dma_mask to allocate consistent
DMA memory during probe.
Change-Id: Ie68c5b04096e77074fd8c91469d2173990fac9bc
Signed-off-by: Pavan Anamula <pavana@codeaurora.org>
[subhashj@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 80d1a7350bc3..1e23ec2d043c 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -3385,9 +3385,11 @@ static int sdhci_msm_probe(struct platform_device *pdev) (dma_supported(mmc_dev(host->mmc), DMA_BIT_MASK(64)))) { host->dma_mask = DMA_BIT_MASK(64); mmc_dev(host->mmc)->dma_mask = &host->dma_mask; + mmc_dev(host->mmc)->coherent_dma_mask = host->dma_mask; } else if (dma_supported(mmc_dev(host->mmc), DMA_BIT_MASK(32))) { host->dma_mask = DMA_BIT_MASK(32); mmc_dev(host->mmc)->dma_mask = &host->dma_mask; + mmc_dev(host->mmc)->coherent_dma_mask = host->dma_mask; } else { dev_err(&pdev->dev, "%s: Failed to set dma mask\n", __func__); } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index e6e818e89c39..8ec61fb5fe76 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -510,6 +510,7 @@ struct sdhci_host { /* Internal data */ struct mmc_host *mmc; /* MMC structure */ u64 dma_mask; /* custom DMA mask */ + u64 coherent_dma_mask; #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) struct led_classdev led; /* LED control */ |