diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-nexcoder.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-nexcoder.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c b/arch/arm/mach-s3c24xx/mach-nexcoder.c index 3066851f584d..c82c281ce351 100644 --- a/arch/arm/mach-s3c24xx/mach-nexcoder.c +++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <linux/platform_data/i2c-s3c2410.h> | 42 | #include <linux/platform_data/i2c-s3c2410.h> |
43 | 43 | ||
44 | #include <plat/gpio-cfg.h> | 44 | #include <plat/gpio-cfg.h> |
45 | #include <plat/clock.h> | ||
46 | #include <plat/devs.h> | 45 | #include <plat/devs.h> |
47 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
48 | #include <plat/samsung-time.h> | 47 | #include <plat/samsung-time.h> |
@@ -135,13 +134,18 @@ static void __init nexcoder_sensorboard_init(void) | |||
135 | static void __init nexcoder_map_io(void) | 134 | static void __init nexcoder_map_io(void) |
136 | { | 135 | { |
137 | s3c24xx_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc)); | 136 | s3c24xx_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc)); |
138 | s3c24xx_init_clocks(0); | ||
139 | s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs)); | 137 | s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs)); |
140 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 138 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
141 | 139 | ||
142 | nexcoder_sensorboard_init(); | 140 | nexcoder_sensorboard_init(); |
143 | } | 141 | } |
144 | 142 | ||
143 | static void __init nexcoder_init_time(void) | ||
144 | { | ||
145 | s3c2440_init_clocks(12000000); | ||
146 | samsung_timer_init(); | ||
147 | } | ||
148 | |||
145 | static void __init nexcoder_init(void) | 149 | static void __init nexcoder_init(void) |
146 | { | 150 | { |
147 | s3c_i2c0_set_platdata(NULL); | 151 | s3c_i2c0_set_platdata(NULL); |
@@ -154,6 +158,6 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") | |||
154 | .map_io = nexcoder_map_io, | 158 | .map_io = nexcoder_map_io, |
155 | .init_machine = nexcoder_init, | 159 | .init_machine = nexcoder_init, |
156 | .init_irq = s3c2440_init_irq, | 160 | .init_irq = s3c2440_init_irq, |
157 | .init_time = samsung_timer_init, | 161 | .init_time = nexcoder_init_time, |
158 | .restart = s3c244x_restart, | 162 | .restart = s3c244x_restart, |
159 | MACHINE_END | 163 | MACHINE_END |