diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-smdk2440.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2440.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2440.c b/arch/arm/mach-s3c24xx/mach-smdk2440.c index d071dcfea548..5fb89c0ae17a 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2440.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2440.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/fb.h> | 38 | #include <mach/fb.h> |
39 | #include <linux/platform_data/i2c-s3c2410.h> | 39 | #include <linux/platform_data/i2c-s3c2410.h> |
40 | 40 | ||
41 | #include <plat/clock.h> | ||
42 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
43 | #include <plat/cpu.h> | 42 | #include <plat/cpu.h> |
44 | #include <plat/samsung-time.h> | 43 | #include <plat/samsung-time.h> |
@@ -159,11 +158,16 @@ static struct platform_device *smdk2440_devices[] __initdata = { | |||
159 | static void __init smdk2440_map_io(void) | 158 | static void __init smdk2440_map_io(void) |
160 | { | 159 | { |
161 | s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); | 160 | s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); |
162 | s3c24xx_init_clocks(16934400); | ||
163 | s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs)); | 161 | s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs)); |
164 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 162 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
165 | } | 163 | } |
166 | 164 | ||
165 | static void __init smdk2440_init_time(void) | ||
166 | { | ||
167 | s3c2440_init_clocks(16934400); | ||
168 | samsung_timer_init(); | ||
169 | } | ||
170 | |||
167 | static void __init smdk2440_machine_init(void) | 171 | static void __init smdk2440_machine_init(void) |
168 | { | 172 | { |
169 | s3c24xx_fb_set_platdata(&smdk2440_fb_info); | 173 | s3c24xx_fb_set_platdata(&smdk2440_fb_info); |
@@ -180,6 +184,6 @@ MACHINE_START(S3C2440, "SMDK2440") | |||
180 | .init_irq = s3c2440_init_irq, | 184 | .init_irq = s3c2440_init_irq, |
181 | .map_io = smdk2440_map_io, | 185 | .map_io = smdk2440_map_io, |
182 | .init_machine = smdk2440_machine_init, | 186 | .init_machine = smdk2440_machine_init, |
183 | .init_time = samsung_timer_init, | 187 | .init_time = smdk2440_init_time, |
184 | .restart = s3c244x_restart, | 188 | .restart = s3c244x_restart, |
185 | MACHINE_END | 189 | MACHINE_END |