diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-12 11:03:52 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-19 07:29:39 +0200 |
commit | 2e27437a642018284aaa30a687f6d471fd2a7729 (patch) | |
tree | 5d3d06aa8dd2ae7d94c180d57668b557a40b1dd0 /arch/arm/mach-s5pv210 | |
parent | Merge branch 'next/board-samsung-2' into next/board-samsung-3 (diff) | |
download | linux-2e27437a642018284aaa30a687f6d471fd2a7729.tar.xz linux-2e27437a642018284aaa30a687f6d471fd2a7729.zip |
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
Since clk_xusbxti.rate is 24Mhz as a default,
so we don't need to set that when it is 24Mhz.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index b2cae1387869..822a55950685 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -908,7 +908,7 @@ static void __init goni_sound_init(void) static void __init goni_map_io(void) { s5pv210_init_io(NULL, 0); - s3c24xx_init_clocks(24000000); + s3c24xx_init_clocks(clk_xusbxti.rate); s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); s5p_set_timer_source(S5P_PWM3, S5P_PWM4); } @@ -966,8 +966,6 @@ static void __init goni_machine_init(void) /* KEYPAD */ samsung_keypad_set_platdata(&keypad_data); - clk_xusbxti.rate = 24000000; - platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices)); } diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index c8997bce642d..918b23d71fdf 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c @@ -285,7 +285,7 @@ static struct platform_pwm_backlight_data smdkv210_bl_data = { static void __init smdkv210_map_io(void) { s5pv210_init_io(NULL, 0); - s3c24xx_init_clocks(24000000); + s3c24xx_init_clocks(clk_xusbxti.rate); s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); s5p_set_timer_source(S5P_PWM2, S5P_PWM4); } @@ -321,7 +321,6 @@ static void __init smdkv210_machine_init(void) samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data); s3c_hsotg_set_platdata(&smdkv210_hsotg_pdata); - clk_xusbxti.rate = 24000000; platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices)); } |