diff options
author | Heiko Stuebner <heiko@sntech.de> | 2014-02-24 19:50:44 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-04-14 13:11:49 -0400 |
commit | 3c27f314c676ee31eafd423ce2c640ed129cd5e0 (patch) | |
tree | aad459937e1ef77ec5195f3f983926ac1bb031af /arch/arm/mach-s3c24xx/mach-smdk2413.c | |
parent | ca2e90ac1809c49c2306df4e23e17dad67c785b6 (diff) |
ARM: S3C24XX: convert s3c2412 to common clock framework
Convert all machines using these cpus to use the ccf clock driver
instead of the legacy Samsung clock implementation.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-smdk2413.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c index 233fe52d2015..a38f8a049e22 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2413.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c | |||
@@ -106,11 +106,16 @@ static void __init smdk2413_fixup(struct tag *tags, char **cmdline, | |||
106 | static void __init smdk2413_map_io(void) | 106 | static void __init smdk2413_map_io(void) |
107 | { | 107 | { |
108 | s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc)); | 108 | s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc)); |
109 | s3c24xx_init_clocks(12000000); | ||
110 | s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs)); | 109 | s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs)); |
111 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | 110 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
112 | } | 111 | } |
113 | 112 | ||
113 | static void __init smdk2413_init_time(void) | ||
114 | { | ||
115 | s3c2412_init_clocks(12000000); | ||
116 | samsung_timer_init(); | ||
117 | } | ||
118 | |||
114 | static void __init smdk2413_machine_init(void) | 119 | static void __init smdk2413_machine_init(void) |
115 | { /* Turn off suspend on both USB ports, and switch the | 120 | { /* Turn off suspend on both USB ports, and switch the |
116 | * selectable USB port to USB device mode. */ | 121 | * selectable USB port to USB device mode. */ |
@@ -159,6 +164,6 @@ MACHINE_START(SMDK2413, "SMDK2413") | |||
159 | .init_irq = s3c2412_init_irq, | 164 | .init_irq = s3c2412_init_irq, |
160 | .map_io = smdk2413_map_io, | 165 | .map_io = smdk2413_map_io, |
161 | .init_machine = smdk2413_machine_init, | 166 | .init_machine = smdk2413_machine_init, |
162 | .init_time = samsung_timer_init, | 167 | .init_time = smdk2413_init_time, |
163 | .restart = s3c2412_restart, | 168 | .restart = s3c2412_restart, |
164 | MACHINE_END | 169 | MACHINE_END |