diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmtreo.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 5305a3993e69..39fd788ab63b 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
22 | #include <linux/gpio_keys.h> | 22 | #include <linux/gpio_keys.h> |
23 | #include <linux/input.h> | 23 | #include <linux/input.h> |
24 | #include <linux/bootmem.h> | ||
24 | #include <linux/pda_power.h> | 25 | #include <linux/pda_power.h> |
25 | #include <linux/pwm_backlight.h> | 26 | #include <linux/pwm_backlight.h> |
26 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
@@ -396,6 +397,11 @@ static void __init palmt5_udc_init(void) | |||
396 | } | 397 | } |
397 | } | 398 | } |
398 | 399 | ||
400 | static void __init palmt5_reserve(void) | ||
401 | { | ||
402 | reserve_bootmem(0xa0200000, 0x1000, BOOTMEM_EXCLUSIVE); | ||
403 | } | ||
404 | |||
399 | static void __init palmt5_init(void) | 405 | static void __init palmt5_init(void) |
400 | { | 406 | { |
401 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config)); | 407 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config)); |
@@ -421,6 +427,7 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5") | |||
421 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 427 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
422 | .boot_params = 0xa0000100, | 428 | .boot_params = 0xa0000100, |
423 | .map_io = pxa_map_io, | 429 | .map_io = pxa_map_io, |
430 | .reserve = palmt5_reserve, | ||
424 | .init_irq = pxa27x_init_irq, | 431 | .init_irq = pxa27x_init_irq, |
425 | .timer = &pxa_timer, | 432 | .timer = &pxa_timer, |
426 | .init_machine = palmt5_init | 433 | .init_machine = palmt5_init |
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index d8b4469607a1..f5db4f7d7158 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <linux/gpio_keys.h> | 21 | #include <linux/gpio_keys.h> |
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/bootmem.h> | ||
23 | #include <linux/pda_power.h> | 24 | #include <linux/pda_power.h> |
24 | #include <linux/pwm_backlight.h> | 25 | #include <linux/pwm_backlight.h> |
25 | #include <linux/gpio.h> | 26 | #include <linux/gpio.h> |
@@ -633,6 +634,12 @@ static void __init treo_lcd_power_init(void) | |||
633 | treo_lcd_screen.pxafb_lcd_power = treo_lcd_power; | 634 | treo_lcd_screen.pxafb_lcd_power = treo_lcd_power; |
634 | } | 635 | } |
635 | 636 | ||
637 | static void __init treo_reserve(void) | ||
638 | { | ||
639 | reserve_bootmem(0xa0000000, 0x1000, BOOTMEM_EXCLUSIVE); | ||
640 | reserve_bootmem(0xa2000000, 0x1000, BOOTMEM_EXCLUSIVE); | ||
641 | } | ||
642 | |||
636 | static void __init treo_init(void) | 643 | static void __init treo_init(void) |
637 | { | 644 | { |
638 | pxa_set_ffuart_info(NULL); | 645 | pxa_set_ffuart_info(NULL); |
@@ -668,6 +675,7 @@ MACHINE_START(TREO680, "Palm Treo 680") | |||
668 | .io_pg_offst = io_p2v(0x40000000), | 675 | .io_pg_offst = io_p2v(0x40000000), |
669 | .boot_params = 0xa0000100, | 676 | .boot_params = 0xa0000100, |
670 | .map_io = pxa_map_io, | 677 | .map_io = pxa_map_io, |
678 | .reserve = treo_reserve, | ||
671 | .init_irq = pxa27x_init_irq, | 679 | .init_irq = pxa27x_init_irq, |
672 | .timer = &pxa_timer, | 680 | .timer = &pxa_timer, |
673 | .init_machine = treo680_init, | 681 | .init_machine = treo680_init, |
@@ -691,6 +699,7 @@ MACHINE_START(CENTRO, "Palm Centro 685") | |||
691 | .io_pg_offst = io_p2v(0x40000000), | 699 | .io_pg_offst = io_p2v(0x40000000), |
692 | .boot_params = 0xa0000100, | 700 | .boot_params = 0xa0000100, |
693 | .map_io = pxa_map_io, | 701 | .map_io = pxa_map_io, |
702 | .reserve = treo_reserve, | ||
694 | .init_irq = pxa27x_init_irq, | 703 | .init_irq = pxa27x_init_irq, |
695 | .timer = &pxa_timer, | 704 | .timer = &pxa_timer, |
696 | .init_machine = centro_init, | 705 | .init_machine = centro_init, |