Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d939bf authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'imx-fixes-4.6' of... 

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 7b91369b
   ("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
parents 22c49e5a fc26fe9c

arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c

+3 −2
Original line number Diff line number Diff line
@@ -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));

}