Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / arch / arm / mach-ep93xx / dma.c

diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c
index d8bfd02..88a4c9b 100644 (file)
--- a/arch/arm/mach-ep93xx/dma.c
+++ b/arch/arm/mach-ep93xx/dma.c
@@ -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),
        },
 };