diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2016-04-22 16:55:05 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2016-04-22 16:55:05 -0700 |
| commit | e6d939bfd43271d7ab0b411d830ab62d835d8536 (patch) | |
| tree | 77b22bffd77bfb3c8c05ec97790222f4ec0ade65 /arch | |
| parent | Merge tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (diff) | |
| parent | ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask (diff) | |
| download | linux-dev-e6d939bfd43271d7ab0b411d830ab62d835d8536.tar.xz linux-dev-e6d939bfd43271d7ab0b411d830ab62d835d8536.zip | |
Merge tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: i.MX fixes for 4.6" from Shawn Guo:
The i.MX fixes for 4.6:
- The sdhci-esdhc-imx DMA support is broken due to commit 7b91369b4655
("mmc: sdhci: Set DMA mask when adding host"). It requires device's
dma_mask be set up properly to get DMA work. The fixing patch
initializes the DMA mask to enable the access again.
* tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c index a5edd7d60266..3d039ef021e0 100644 --- a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c +++ b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c @@ -71,6 +71,7 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx( if (!pdata) pdata = &default_esdhc_pdata; - return imx_add_platform_device(data->devid, data->id, res, - ARRAY_SIZE(res), pdata, sizeof(*pdata)); + return imx_add_platform_device_dmamask(data->devid, data->id, res, + ARRAY_SIZE(res), pdata, sizeof(*pdata), + DMA_BIT_MASK(32)); } |