Commit 7553ee77 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

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


Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 5065c71d
...@@ -169,6 +169,9 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform") ...@@ -169,6 +169,9 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = avila_init, .init_machine = avila_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
/* /*
...@@ -184,6 +187,9 @@ MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") ...@@ -184,6 +187,9 @@ MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = avila_init, .init_machine = avila_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -114,6 +114,9 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") ...@@ -114,6 +114,9 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = coyote_init, .init_machine = coyote_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
......
...@@ -284,4 +284,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") ...@@ -284,4 +284,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")
.init_irq = ixp4xx_init_irq, .init_irq = ixp4xx_init_irq,
.timer = &dsmg600_timer, .timer = &dsmg600_timer,
.init_machine = dsmg600_init, .init_machine = dsmg600_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -275,5 +275,8 @@ MACHINE_START(FSG, "Freecom FSG-3") ...@@ -275,5 +275,8 @@ MACHINE_START(FSG, "Freecom FSG-3")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = fsg_init, .init_machine = fsg_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -101,5 +101,8 @@ MACHINE_START(GATEWAY7001, "Gateway 7001 AP") ...@@ -101,5 +101,8 @@ MACHINE_START(GATEWAY7001, "Gateway 7001 AP")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = gateway7001_init, .init_machine = gateway7001_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -501,4 +501,7 @@ MACHINE_START(GORAMO_MLR, "MultiLink") ...@@ -501,4 +501,7 @@ MACHINE_START(GORAMO_MLR, "MultiLink")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = gmlr_init, .init_machine = gmlr_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -169,6 +169,9 @@ MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)") ...@@ -169,6 +169,9 @@ MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = gtwx5715_init, .init_machine = gtwx5715_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -14,8 +14,4 @@ ...@@ -14,8 +14,4 @@
*/ */
#define PLAT_PHYS_OFFSET UL(0x00000000) #define PLAT_PHYS_OFFSET UL(0x00000000)
#ifdef CONFIG_PCI
#define ARM_DMA_ZONE_SIZE SZ_64M
#endif
#endif #endif
...@@ -258,6 +258,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") ...@@ -258,6 +258,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = ixdp425_init, .init_machine = ixdp425_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -269,6 +272,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") ...@@ -269,6 +272,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = ixdp425_init, .init_machine = ixdp425_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -280,6 +286,9 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") ...@@ -280,6 +286,9 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = ixdp425_init, .init_machine = ixdp425_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -291,5 +300,8 @@ MACHINE_START(KIXRP435, "Intel KIXRP435 Reference Platform") ...@@ -291,5 +300,8 @@ MACHINE_START(KIXRP435, "Intel KIXRP435 Reference Platform")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = ixdp425_init, .init_machine = ixdp425_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
...@@ -319,4 +319,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d") ...@@ -319,4 +319,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d")
.init_irq = ixp4xx_init_irq, .init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.init_machine = nas100d_init, .init_machine = nas100d_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -305,4 +305,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") ...@@ -305,4 +305,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2")
.init_irq = ixp4xx_init_irq, .init_irq = ixp4xx_init_irq,
.timer = &nslu2_timer, .timer = &nslu2_timer,
.init_machine = nslu2_init, .init_machine = nslu2_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -241,4 +241,7 @@ MACHINE_START(ARCOM_VULCAN, "Arcom/Eurotech Vulcan") ...@@ -241,4 +241,7 @@ MACHINE_START(ARCOM_VULCAN, "Arcom/Eurotech Vulcan")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = vulcan_init, .init_machine = vulcan_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
...@@ -102,5 +102,8 @@ MACHINE_START(WG302V2, "Netgear WG302 v2 / WAG302 v2") ...@@ -102,5 +102,8 @@ MACHINE_START(WG302V2, "Netgear WG302 v2 / WAG302 v2")
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
.boot_params = 0x0100, .boot_params = 0x0100,
.init_machine = wg302v2_init, .init_machine = wg302v2_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,
#endif
MACHINE_END MACHINE_END
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment