diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-rx3715.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx3715.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c index e6535ce1bc5c..6e749ec3a2ea 100644 --- a/arch/arm/mach-s3c24xx/mach-rx3715.c +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <mach/regs-lcd.h> | 46 | #include <mach/regs-lcd.h> |
47 | #include <mach/gpio-samsung.h> | 47 | #include <mach/gpio-samsung.h> |
48 | 48 | ||
49 | #include <plat/clock.h> | ||
50 | #include <plat/cpu.h> | 49 | #include <plat/cpu.h> |
51 | #include <plat/devs.h> | 50 | #include <plat/devs.h> |
52 | #include <plat/pm.h> | 51 | #include <plat/pm.h> |
@@ -179,11 +178,16 @@ static struct platform_device *rx3715_devices[] __initdata = { | |||
179 | static void __init rx3715_map_io(void) | 178 | static void __init rx3715_map_io(void) |
180 | { | 179 | { |
181 | s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc)); | 180 | s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc)); |
182 | s3c24xx_init_clocks(16934000); | ||
183 | s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs)); | 181 | s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs)); |
184 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 182 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
185 | } | 183 | } |
186 | 184 | ||
185 | static void __init rx3715_init_time(void) | ||
186 | { | ||
187 | s3c2440_init_clocks(16934000); | ||
188 | samsung_timer_init(); | ||
189 | } | ||
190 | |||
187 | /* H1940 and RX3715 need to reserve this for suspend */ | 191 | /* H1940 and RX3715 need to reserve this for suspend */ |
188 | static void __init rx3715_reserve(void) | 192 | static void __init rx3715_reserve(void) |
189 | { | 193 | { |
@@ -210,6 +214,6 @@ MACHINE_START(RX3715, "IPAQ-RX3715") | |||
210 | .reserve = rx3715_reserve, | 214 | .reserve = rx3715_reserve, |
211 | .init_irq = s3c2440_init_irq, | 215 | .init_irq = s3c2440_init_irq, |
212 | .init_machine = rx3715_init_machine, | 216 | .init_machine = rx3715_init_machine, |
213 | .init_time = samsung_timer_init, | 217 | .init_time = rx3715_init_time, |
214 | .restart = s3c244x_restart, | 218 | .restart = s3c244x_restart, |
215 | MACHINE_END | 219 | MACHINE_END |