aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-iop13xx/setup.c8
-rw-r--r--arch/arm/mach-iop13xx/tpmi.c10
-rw-r--r--arch/arm/plat-iop/adma.c6
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 53c316f7301e..fe4932fda01d 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = {
300 } 300 }
301}; 301};
302 302
303static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64); 303static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);
304static struct iop_adma_platform_data iop13xx_adma_0_data = { 304static struct iop_adma_platform_data iop13xx_adma_0_data = {
305 .hw_id = 0, 305 .hw_id = 0,
306 .pool_size = PAGE_SIZE, 306 .pool_size = PAGE_SIZE,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = {
324 .resource = iop13xx_adma_0_resources, 324 .resource = iop13xx_adma_0_resources,
325 .dev = { 325 .dev = {
326 .dma_mask = &iop13xx_adma_dmamask, 326 .dma_mask = &iop13xx_adma_dmamask,
327 .coherent_dma_mask = DMA_BIT_MASK(64), 327 .coherent_dma_mask = DMA_BIT_MASK(32),
328 .platform_data = (void *) &iop13xx_adma_0_data, 328 .platform_data = (void *) &iop13xx_adma_0_data,
329 }, 329 },
330}; 330};
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = {
336 .resource = iop13xx_adma_1_resources, 336 .resource = iop13xx_adma_1_resources,
337 .dev = { 337 .dev = {
338 .dma_mask = &iop13xx_adma_dmamask, 338 .dma_mask = &iop13xx_adma_dmamask,
339 .coherent_dma_mask = DMA_BIT_MASK(64), 339 .coherent_dma_mask = DMA_BIT_MASK(32),
340 .platform_data = (void *) &iop13xx_adma_1_data, 340 .platform_data = (void *) &iop13xx_adma_1_data,
341 }, 341 },
342}; 342};
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = {
348 .resource = iop13xx_adma_2_resources, 348 .resource = iop13xx_adma_2_resources,
349 .dev = { 349 .dev = {
350 .dma_mask = &iop13xx_adma_dmamask, 350 .dma_mask = &iop13xx_adma_dmamask,
351 .coherent_dma_mask = DMA_BIT_MASK(64), 351 .coherent_dma_mask = DMA_BIT_MASK(32),
352 .platform_data = (void *) &iop13xx_adma_2_data, 352 .platform_data = (void *) &iop13xx_adma_2_data,
353 }, 353 },
354}; 354};
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index db511ec2b1df..116feb6b261e 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = {
152 } 152 }
153}; 153};
154 154
155u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64); 155u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);
156static struct platform_device iop13xx_tpmi_0_device = { 156static struct platform_device iop13xx_tpmi_0_device = {
157 .name = "iop-tpmi", 157 .name = "iop-tpmi",
158 .id = 0, 158 .id = 0,
@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = {
160 .resource = iop13xx_tpmi_0_resources, 160 .resource = iop13xx_tpmi_0_resources,
161 .dev = { 161 .dev = {
162 .dma_mask = &iop13xx_tpmi_mask, 162 .dma_mask = &iop13xx_tpmi_mask,
163 .coherent_dma_mask = DMA_BIT_MASK(64), 163 .coherent_dma_mask = DMA_BIT_MASK(32),
164 }, 164 },
165}; 165};
166 166
@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
171 .resource = iop13xx_tpmi_1_resources, 171 .resource = iop13xx_tpmi_1_resources,
172 .dev = { 172 .dev = {
173 .dma_mask = &iop13xx_tpmi_mask, 173 .dma_mask = &iop13xx_tpmi_mask,
174 .coherent_dma_mask = DMA_BIT_MASK(64), 174 .coherent_dma_mask = DMA_BIT_MASK(32),
175 }, 175 },
176}; 176};
177 177
@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
182 .resource = iop13xx_tpmi_2_resources, 182 .resource = iop13xx_tpmi_2_resources,
183 .dev = { 183 .dev = {
184 .dma_mask = &iop13xx_tpmi_mask, 184 .dma_mask = &iop13xx_tpmi_mask,
185 .coherent_dma_mask = DMA_BIT_MASK(64), 185 .coherent_dma_mask = DMA_BIT_MASK(32),
186 }, 186 },
187}; 187};
188 188
@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = {
193 .resource = iop13xx_tpmi_3_resources, 193 .resource = iop13xx_tpmi_3_resources,
194 .dev = { 194 .dev = {
195 .dma_mask = &iop13xx_tpmi_mask, 195 .dma_mask = &iop13xx_tpmi_mask,
196 .coherent_dma_mask = DMA_BIT_MASK(64), 196 .coherent_dma_mask = DMA_BIT_MASK(32),
197 }, 197 },
198}; 198};
199 199
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c
index a4d1f8de3b5b..d9612221e484 100644
--- a/arch/arm/plat-iop/adma.c
+++ b/arch/arm/plat-iop/adma.c
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = {
143 .resource = iop3xx_dma_0_resources, 143 .resource = iop3xx_dma_0_resources,
144 .dev = { 144 .dev = {
145 .dma_mask = &iop3xx_adma_dmamask, 145 .dma_mask = &iop3xx_adma_dmamask,
146 .coherent_dma_mask = DMA_BIT_MASK(64), 146 .coherent_dma_mask = DMA_BIT_MASK(32),
147 .platform_data = (void *) &iop3xx_dma_0_data, 147 .platform_data = (void *) &iop3xx_dma_0_data,
148 }, 148 },
149}; 149};
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = {
155 .resource = iop3xx_dma_1_resources, 155 .resource = iop3xx_dma_1_resources,
156 .dev = { 156 .dev = {
157 .dma_mask = &iop3xx_adma_dmamask, 157 .dma_mask = &iop3xx_adma_dmamask,
158 .coherent_dma_mask = DMA_BIT_MASK(64), 158 .coherent_dma_mask = DMA_BIT_MASK(32),
159 .platform_data = (void *) &iop3xx_dma_1_data, 159 .platform_data = (void *) &iop3xx_dma_1_data,
160 }, 160 },
161}; 161};
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = {
167 .resource = iop3xx_aau_resources, 167 .resource = iop3xx_aau_resources,
168 .dev = { 168 .dev = {
169 .dma_mask = &iop3xx_adma_dmamask, 169 .dma_mask = &iop3xx_adma_dmamask,
170 .coherent_dma_mask = DMA_BIT_MASK(64), 170 .coherent_dma_mask = DMA_BIT_MASK(32),
171 .platform_data = (void *) &iop3xx_aau_data, 171 .platform_data = (void *) &iop3xx_aau_data,
172 }, 172 },
173}; 173};