diff options
author | Heiko Stuebner <heiko@sntech.de> | 2014-05-08 16:51:43 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-12 19:00:46 -0400 |
commit | 2916f9a2c6d9200b4c840a613cd1fa1dad04240f (patch) | |
tree | 602d956f720618bf88ec09f18b6178e8348b1f1f /arch/arm/mach-s3c24xx/mach-vr1000.c | |
parent | defd9da51d1a472ffa7a92ba71ffa07839bdc1a3 (diff) |
ARM: S3C24XX: remove SAMSUNG_CLOCK remnants after ccf conversion
This finally removes all remaining SAMSUNG_CLOCK conditional code
from s3c24xx architectures.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-vr1000.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-vr1000.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-vr1000.c b/arch/arm/mach-s3c24xx/mach-vr1000.c index 5f588bf20f43..f88c584c3001 100644 --- a/arch/arm/mach-s3c24xx/mach-vr1000.c +++ b/arch/arm/mach-s3c24xx/mach-vr1000.c | |||
@@ -299,16 +299,6 @@ static struct platform_device *vr1000_devices[] __initdata = { | |||
299 | &vr1000_led3, | 299 | &vr1000_led3, |
300 | }; | 300 | }; |
301 | 301 | ||
302 | #ifdef CONFIG_SAMSUNG_CLOCK | ||
303 | static struct clk *vr1000_clocks[] __initdata = { | ||
304 | &s3c24xx_dclk0, | ||
305 | &s3c24xx_dclk1, | ||
306 | &s3c24xx_clkout0, | ||
307 | &s3c24xx_clkout1, | ||
308 | &s3c24xx_uclk, | ||
309 | }; | ||
310 | #endif | ||
311 | |||
312 | static void vr1000_power_off(void) | 302 | static void vr1000_power_off(void) |
313 | { | 303 | { |
314 | gpio_direction_output(S3C2410_GPB(9), 1); | 304 | gpio_direction_output(S3C2410_GPB(9), 1); |
@@ -316,23 +306,6 @@ static void vr1000_power_off(void) | |||
316 | 306 | ||
317 | static void __init vr1000_map_io(void) | 307 | static void __init vr1000_map_io(void) |
318 | { | 308 | { |
319 | #if CONFIG_SAMSUNG_CLOCK | ||
320 | /* initialise clock sources */ | ||
321 | |||
322 | s3c24xx_dclk0.parent = &clk_upll; | ||
323 | s3c24xx_dclk0.rate = 12*1000*1000; | ||
324 | |||
325 | s3c24xx_dclk1.parent = NULL; | ||
326 | s3c24xx_dclk1.rate = 3692307; | ||
327 | |||
328 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; | ||
329 | s3c24xx_clkout1.parent = &s3c24xx_dclk1; | ||
330 | |||
331 | s3c24xx_uclk.parent = &s3c24xx_clkout1; | ||
332 | |||
333 | s3c24xx_register_clocks(vr1000_clocks, ARRAY_SIZE(vr1000_clocks)); | ||
334 | #endif | ||
335 | |||
336 | pm_power_off = vr1000_power_off; | 309 | pm_power_off = vr1000_power_off; |
337 | 310 | ||
338 | s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc)); | 311 | s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc)); |