diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 79bc0830d740..af4334d6b4d5 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c | |||
@@ -62,7 +62,7 @@ | |||
62 | #include <plat/pll.h> | 62 | #include <plat/pll.h> |
63 | #include <plat/pm.h> | 63 | #include <plat/pm.h> |
64 | #include <plat/regs-serial.h> | 64 | #include <plat/regs-serial.h> |
65 | 65 | #include <plat/samsung-time.h> | |
66 | 66 | ||
67 | #include "common.h" | 67 | #include "common.h" |
68 | #include "h1940.h" | 68 | #include "h1940.h" |
@@ -646,6 +646,7 @@ static void __init h1940_map_io(void) | |||
646 | s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc)); | 646 | s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc)); |
647 | s3c24xx_init_clocks(0); | 647 | s3c24xx_init_clocks(0); |
648 | s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs)); | 648 | s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs)); |
649 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
649 | 650 | ||
650 | /* setup PM */ | 651 | /* setup PM */ |
651 | 652 | ||
@@ -666,11 +667,6 @@ static void __init h1940_reserve(void) | |||
666 | memblock_reserve(0x30081000, 0x1000); | 667 | memblock_reserve(0x30081000, 0x1000); |
667 | } | 668 | } |
668 | 669 | ||
669 | static void __init h1940_init_irq(void) | ||
670 | { | ||
671 | s3c24xx_init_irq(); | ||
672 | } | ||
673 | |||
674 | static void __init h1940_init(void) | 670 | static void __init h1940_init(void) |
675 | { | 671 | { |
676 | u32 tmp; | 672 | u32 tmp; |
@@ -739,8 +735,8 @@ MACHINE_START(H1940, "IPAQ-H1940") | |||
739 | .atag_offset = 0x100, | 735 | .atag_offset = 0x100, |
740 | .map_io = h1940_map_io, | 736 | .map_io = h1940_map_io, |
741 | .reserve = h1940_reserve, | 737 | .reserve = h1940_reserve, |
742 | .init_irq = h1940_init_irq, | 738 | .init_irq = s3c2410_init_irq, |
743 | .init_machine = h1940_init, | 739 | .init_machine = h1940_init, |
744 | .init_time = s3c24xx_timer_init, | 740 | .init_time = samsung_timer_init, |
745 | .restart = s3c2410_restart, | 741 | .restart = s3c2410_restart, |
746 | MACHINE_END | 742 | MACHINE_END |