diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-21 12:23:42 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 06:34:08 -0500 |
commit | b2b54c9f76d2f5c2c14759b709b2af1ee397fbb2 (patch) | |
tree | 905952e723b0614617729fb02b5ade05c3eedc01 | |
parent | daac6f8642f786a9576b2b6b0224012d54e4506b (diff) |
arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers
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>
-rw-r--r-- | arch/arm/mach-ep93xx/dma.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c index d8bfd02f5047..88a4c9b089a5 100644 --- 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 = { | |||
66 | .num_channels = ARRAY_SIZE(ep93xx_dma_m2p_channels), | 66 | .num_channels = ARRAY_SIZE(ep93xx_dma_m2p_channels), |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static u64 ep93xx_dma_m2p_mask = DMA_BIT_MASK(32); | ||
70 | |||
69 | static struct platform_device ep93xx_dma_m2p_device = { | 71 | static struct platform_device ep93xx_dma_m2p_device = { |
70 | .name = "ep93xx-dma-m2p", | 72 | .name = "ep93xx-dma-m2p", |
71 | .id = -1, | 73 | .id = -1, |
72 | .dev = { | 74 | .dev = { |
73 | .platform_data = &ep93xx_dma_m2p_data, | 75 | .platform_data = &ep93xx_dma_m2p_data, |
76 | .dma_mask = &ep93xx_dma_m2p_mask, | ||
77 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
74 | }, | 78 | }, |
75 | }; | 79 | }; |
76 | 80 | ||
@@ -93,11 +97,15 @@ static struct ep93xx_dma_platform_data ep93xx_dma_m2m_data = { | |||
93 | .num_channels = ARRAY_SIZE(ep93xx_dma_m2m_channels), | 97 | .num_channels = ARRAY_SIZE(ep93xx_dma_m2m_channels), |
94 | }; | 98 | }; |
95 | 99 | ||
100 | static u64 ep93xx_dma_m2m_mask = DMA_BIT_MASK(32); | ||
101 | |||
96 | static struct platform_device ep93xx_dma_m2m_device = { | 102 | static struct platform_device ep93xx_dma_m2m_device = { |
97 | .name = "ep93xx-dma-m2m", | 103 | .name = "ep93xx-dma-m2m", |
98 | .id = -1, | 104 | .id = -1, |
99 | .dev = { | 105 | .dev = { |
100 | .platform_data = &ep93xx_dma_m2m_data, | 106 | .platform_data = &ep93xx_dma_m2m_data, |
107 | .dma_mask = &ep93xx_dma_m2m_mask, | ||
108 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
101 | }, | 109 | }, |
102 | }; | 110 | }; |
103 | 111 | ||