[PATCHv2 4/4] arm: Added CMA to Aquila and Goni
in [Kernel]
|
Prev: [PATCHv2 0/4] The Contiguous Memory Allocator
Next: [PATCHv2 3/4] mm: cma: Test device and application added
From: Michal Nazarewicz on 26 Jul 2010 10:20 Added the CMA initialisation code to two Samsung platforms. Signed-off-by: Michal Nazarewicz <m.nazarewicz(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/mach-s5pv210/mach-aquila.c | 13 +++++++++++++ arch/arm/mach-s5pv210/mach-goni.c | 13 +++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 0992618..ab156f9 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -19,6 +19,7 @@ #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/cma.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -454,6 +455,17 @@ static void __init aquila_map_io(void) s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); } +static void __init aquila_reserve(void) +{ + static char regions[] __initdata = + "-mfc_fw=1M/128K;mfc_b1=32M;mfc_b2=16M(a)0x40000000"; + static char map[] __initdata = + "s3c-mfc5/f=mfc_fw;s3c-mfc5/a=mfc_b1;s3c-mfc5/b=mfc_b2"; + + cma_set_defaults(regions, map, NULL); + cma_early_regions_reserve(NULL); +} + static void __init aquila_machine_init(void) { /* PMIC */ @@ -478,4 +490,5 @@ MACHINE_START(AQUILA, "Aquila") .map_io = aquila_map_io, .init_machine = aquila_machine_init, .timer = &s3c24xx_timer, + .reserve = aquila_reserve, MACHINE_END diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 7b18505..2b0a349 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -19,6 +19,7 @@ #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/cma.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -435,6 +436,17 @@ static void __init goni_map_io(void) s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); } +static void __init goni_reserve(void) +{ + static char regions[] __initdata = + "-mfc_fw=1M/128K;mfc_b1=32M;mfc_b2=16M(a)0x40000000"; + static char map[] __initdata = + "s3c-mfc5/f=mfc_fw;s3c-mfc5/a=mfc_b1;s3c-mfc5/b=mfc_b2"; + + cma_set_defaults(regions, map, NULL); + cma_early_regions_reserve(NULL); +} + static void __init goni_machine_init(void) { /* PMIC */ @@ -456,4 +468,5 @@ MACHINE_START(GONI, "GONI") .map_io = goni_map_io, .init_machine = goni_machine_init, .timer = &s3c24xx_timer, + .reserve = goni_reserve, MACHINE_END -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |