]> git.karo-electronics.de Git - linux-beck.git/commitdiff
arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 21 Nov 2014 17:23:42 +0000 (10:23 -0700)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 11:34:08 +0000 (12:34 +0100)
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>
arch/arm/mach-ep93xx/dma.c

index d8bfd02f5047f732af84cae4483bd57be12edeb0..88a4c9b089a559c07d6d0d6c2e7159438d036351 100644 (file)
@@ -66,11 +66,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2p_data = {
        .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 = {
        .name                   = "ep93xx-dma-m2p",
        .id                     = -1,
        .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),
 };
 
+static u64 ep93xx_dma_m2m_mask = DMA_BIT_MASK(32);
+
 static struct platform_device ep93xx_dma_m2m_device = {
        .name                   = "ep93xx-dma-m2m",
        .id                     = -1,
        .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),
        },
 };