ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>

ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Nicolas Pitre · Nicolas Pitre
1 parent 7553ee777b
Showing 2 changed files with 3 additions and 4 deletions Side-by-side Diff
arch/arm/mach-pxa/cm-x2xx.c
arch/arm/mach-pxa/include/mach/memory.h
@@ -518,5 +518,8 @@
 	.init_irq	= cmx2xx_init_irq,
 	.timer		= &pxa_timer,
 	.init_machine	= cmx2xx_init,
+#ifdef CONFIG_PCI
+	.dma_zone_size	= SZ_64M,
+#endif
 MACHINE_END
@@ -17,9 +17,5 @@
  */
 #define PLAT_PHYS_OFFSET	UL(0xa0000000)
  
-#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
-#define ARM_DMA_ZONE_SIZE	SZ_64M
-#endif
-
 #endif
...	...	@@ -518,5 +518,8 @@
518	518	.init_irq = cmx2xx_init_irq,
519	519	.timer = &pxa_timer,
520	520	.init_machine = cmx2xx_init,
	521	+#ifdef CONFIG_PCI
	522	+ .dma_zone_size = SZ_64M,
	523	+#endif
521	524	MACHINE_END
...	...	@@ -17,9 +17,5 @@
17	17	*/
18	18	#define PLAT_PHYS_OFFSET UL(0xa0000000)
19	19
20		-#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
21		-#define ARM_DMA_ZONE_SIZE SZ_64M
22		-#endif
23		-
24	20	#endif