iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers

Browse Source 
The dma_mask and coherent_dma_mask need to be set or DMA memory allocations
will fail with error messages like this:

  ep93xx-dma ep93xx-dma-m2p: coherent DMA mask is unset

  ep93xx-dma ep93xx-dma-m2m: coherent DMA mask is unset

Add the missing information to the ep93xx-dma-m2p and ep93xx-dma-m2m
devices.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: Jeremy Moles <cubicool@gmail.com>
Tested-by: Alexander Sverdlin <subaparts@yandex.ru>
Cc: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
H Hartley Sweeten 2014-11-21 10:23:42 -07:00 committed by Arnd Bergmann
parent daac6f8642
commit b2b54c9f76
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-ep93xx/dma.c
View File

@ -66,11 +66,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2p_data = {
.num_channels = ARRAY_SIZE(ep93xx_dma_m2p_channels), .num_channels = ARRAY_SIZE(ep93xx_dma_m2p_channels),
}; };
static u64 ep93xx_dma_m2p_mask = DMA_BIT_MASK(32);
static struct platform_device ep93xx_dma_m2p_device = { static struct platform_device ep93xx_dma_m2p_device = {
.name = "ep93xx-dma-m2p", .name = "ep93xx-dma-m2p",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &ep93xx_dma_m2p_data, .platform_data = &ep93xx_dma_m2p_data,
.dma_mask = &ep93xx_dma_m2p_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
@ -93,11 +97,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2m_data = {
.num_channels = ARRAY_SIZE(ep93xx_dma_m2m_channels), .num_channels = ARRAY_SIZE(ep93xx_dma_m2m_channels),
}; };
static u64 ep93xx_dma_m2m_mask = DMA_BIT_MASK(32);
static struct platform_device ep93xx_dma_m2m_device = { static struct platform_device ep93xx_dma_m2m_device = {
.name = "ep93xx-dma-m2m", .name = "ep93xx-dma-m2m",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &ep93xx_dma_m2m_data, .platform_data = &ep93xx_dma_m2m_data,
.dma_mask = &ep93xx_dma_m2m_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };