diff options
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 779b45b3f80..3ba3bab139d 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
| 18 | #include <linux/memblock.h> | ||
| 18 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 20 | #include <linux/sysdev.h> | 21 | #include <linux/sysdev.h> |
| @@ -304,6 +305,13 @@ static void __init h1940_map_io(void) | |||
| 304 | s3c_pm_init(); | 305 | s3c_pm_init(); |
| 305 | } | 306 | } |
| 306 | 307 | ||
| 308 | /* H1940 and RX3715 need to reserve this for suspend */ | ||
| 309 | static void __init h1940_reserve(void) | ||
| 310 | { | ||
| 311 | memblock_reserve(0x30003000, 0x1000); | ||
| 312 | memblock_reserve(0x30081000, 0x1000); | ||
| 313 | } | ||
| 314 | |||
| 307 | static void __init h1940_init_irq(void) | 315 | static void __init h1940_init_irq(void) |
| 308 | { | 316 | { |
| 309 | s3c24xx_init_irq(); | 317 | s3c24xx_init_irq(); |
| @@ -346,6 +354,7 @@ MACHINE_START(H1940, "IPAQ-H1940") | |||
| 346 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | 354 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, |
| 347 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 355 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
| 348 | .map_io = h1940_map_io, | 356 | .map_io = h1940_map_io, |
| 357 | .reserve = h1940_reserve, | ||
| 349 | .init_irq = h1940_init_irq, | 358 | .init_irq = h1940_init_irq, |
| 350 | .init_machine = h1940_init, | 359 | .init_machine = h1940_init, |
| 351 | .timer = &s3c24xx_timer, | 360 | .timer = &s3c24xx_timer, |
