From 0cc9311fad9eab567cea0b94e37ef73aef7a8cee Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:38:18 -0400 Subject: ARM: mach-prima2: convert boot_params to atag_offset Signed-off-by: Nicolas Pitre Acked-by: Arnd Bergmann --- arch/arm/mach-prima2/prima2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-prima2/prima2.c') diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c index f57124bdd14..5654a04319f 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/prima2.c @@ -31,7 +31,7 @@ static const char *prima2cb_dt_match[] __initdata = { MACHINE_START(PRIMA2_EVB, "prima2cb") /* Maintainer: Barry Song */ - .boot_params = 0x00000100, + .atag_offset = 0x100, .init_early = sirfsoc_of_clk_init, .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init, -- cgit v1.2.3-70-g09d2 From 98b0124f0e2b88ec74cbd9345cf6195e527ce251 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Fri, 2 Sep 2011 21:05:10 -0400 Subject: ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size Original comment: Restrict DMA-able region to workaround silicon limitation. The limitation restricts buffers available for DMA to SD/MMC hardware to be below 256MB. Signed-off-by: Nicolas Pitre --- arch/arm/mach-prima2/include/mach/memory.h | 7 ------- arch/arm/mach-prima2/prima2.c | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'arch/arm/mach-prima2/prima2.c') diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h index 368cd5a0601..0d5ee6af8c5 100644 --- a/arch/arm/mach-prima2/include/mach/memory.h +++ b/arch/arm/mach-prima2/include/mach/memory.h @@ -11,11 +11,4 @@ #define PLAT_PHYS_OFFSET UL(0x00000000) -/* - * Restrict DMA-able region to workaround silicon limitation. - * The limitation restricts buffers available for DMA to SD/MMC - * hardware to be below 256MB - */ -#define ARM_DMA_ZONE_SIZE (SZ_256M) - #endif diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c index 5654a04319f..ee33c3d458f 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/prima2.c @@ -36,6 +36,7 @@ MACHINE_START(PRIMA2_EVB, "prima2cb") .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init, .timer = &sirfsoc_timer, + .dma_zone_size = SZ_256M, .init_machine = sirfsoc_mach_init, .dt_compat = prima2cb_dt_match, MACHINE_END -- cgit v1.2.3-70-g09d2