diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-otom.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-otom.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-otom.c b/arch/arm/mach-s3c24xx/mach-otom.c index bdb3faac2d9b..45833001186d 100644 --- a/arch/arm/mach-s3c24xx/mach-otom.c +++ b/arch/arm/mach-s3c24xx/mach-otom.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
31 | #include <mach/regs-gpio.h> | 31 | #include <mach/regs-gpio.h> |
32 | 32 | ||
33 | #include <plat/clock.h> | ||
34 | #include <plat/cpu.h> | 33 | #include <plat/cpu.h> |
35 | #include <plat/devs.h> | 34 | #include <plat/devs.h> |
36 | #include <plat/samsung-time.h> | 35 | #include <plat/samsung-time.h> |
@@ -100,11 +99,16 @@ static struct platform_device *otom11_devices[] __initdata = { | |||
100 | static void __init otom11_map_io(void) | 99 | static void __init otom11_map_io(void) |
101 | { | 100 | { |
102 | s3c24xx_init_io(otom11_iodesc, ARRAY_SIZE(otom11_iodesc)); | 101 | s3c24xx_init_io(otom11_iodesc, ARRAY_SIZE(otom11_iodesc)); |
103 | s3c24xx_init_clocks(0); | ||
104 | s3c24xx_init_uarts(otom11_uartcfgs, ARRAY_SIZE(otom11_uartcfgs)); | 102 | s3c24xx_init_uarts(otom11_uartcfgs, ARRAY_SIZE(otom11_uartcfgs)); |
105 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 103 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
106 | } | 104 | } |
107 | 105 | ||
106 | static void __init otom11_init_time(void) | ||
107 | { | ||
108 | s3c2410_init_clocks(12000000); | ||
109 | samsung_timer_init(); | ||
110 | } | ||
111 | |||
108 | static void __init otom11_init(void) | 112 | static void __init otom11_init(void) |
109 | { | 113 | { |
110 | s3c_i2c0_set_platdata(NULL); | 114 | s3c_i2c0_set_platdata(NULL); |
@@ -117,6 +121,6 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1") | |||
117 | .map_io = otom11_map_io, | 121 | .map_io = otom11_map_io, |
118 | .init_machine = otom11_init, | 122 | .init_machine = otom11_init, |
119 | .init_irq = s3c2410_init_irq, | 123 | .init_irq = s3c2410_init_irq, |
120 | .init_time = samsung_timer_init, | 124 | .init_time = otom11_init_time, |
121 | .restart = s3c2410_restart, | 125 | .restart = s3c2410_restart, |
122 | MACHINE_END | 126 | MACHINE_END |