diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 18:18:57 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 11:06:40 +0100 |
| commit | 98c672cf1fa2a56f6f43e3f48b1208b83845582c (patch) | |
| tree | 39ac68eb0d260f090cebabff9a2f2cf8c6bcebd2 /arch/arm/mach-s3c2410/mach-h1940.c | |
| parent | b65b4781fbd5846a82cdac0c32818af1a7452d1f (diff) | |
| download | blackbird-op-linux-98c672cf1fa2a56f6f43e3f48b1208b83845582c.tar.gz blackbird-op-linux-98c672cf1fa2a56f6f43e3f48b1208b83845582c.zip | |
ARM: Move platform memory reservations out of generic code
Move the platform specific bootmem memory reservations out of
arch/arm/mm/mmu.c into their respective platform files.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-h1940.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 779b45b3f80f..2407aab4d1b8 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -15,6 +15,7 @@ #include <linux/types.h> #include <linux/interrupt.h> #include <linux/list.h> +#include <linux/bootmem.h> #include <linux/timer.h> #include <linux/init.h> #include <linux/sysdev.h> @@ -304,6 +305,13 @@ static void __init h1940_map_io(void) s3c_pm_init(); } +/* H1940 and RX3715 need to reserve this for suspend */ +static void __init h1940_reserve(void) +{ + reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT); + reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT); +} + static void __init h1940_init_irq(void) { s3c24xx_init_irq(); @@ -346,6 +354,7 @@ MACHINE_START(H1940, "IPAQ-H1940") .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, .map_io = h1940_map_io, + .reserve = h1940_reserve, .init_irq = h1940_init_irq, .init_machine = h1940_init, .timer = &s3c24xx_timer, |
