aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-07-12 05:03:52 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-07-19 01:29:39 -0400
commit2e27437a642018284aaa30a687f6d471fd2a7729 (patch)
tree5d3d06aa8dd2ae7d94c180d57668b557a40b1dd0 /arch/arm
parent23c7301d74ac2d80d0dafd6f84a6d11a0fc15ce5 (diff)
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')
-rw-r--r--arch/arm/mach-exynos/mach-nuri.c3
-rw-r--r--arch/arm/mach-exynos/mach-origen.c3
-rw-r--r--arch/arm/mach-exynos/mach-smdk4x12.c2
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c3
-rw-r--r--arch/arm/mach-exynos/mach-universal_c210.c3
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c4
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkv210.c3
7 files changed, 6 insertions, 15 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 656f8fc9addd..129c4c762dec 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1342,9 +1342,8 @@ static struct platform_device *nuri_devices[] __initdata = {
1342 1342
1343static void __init nuri_map_io(void) 1343static void __init nuri_map_io(void)
1344{ 1344{
1345 clk_xusbxti.rate = 24000000;
1346 exynos_init_io(NULL, 0); 1345 exynos_init_io(NULL, 0);
1347 s3c24xx_init_clocks(24000000); 1346 s3c24xx_init_clocks(clk_xusbxti.rate);
1348 s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs)); 1347 s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));
1349} 1348}
1350 1349
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 9ed0229db8ae..b563b43fee83 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -717,7 +717,7 @@ static void s5p_tv_setup(void)
717static void __init origen_map_io(void) 717static void __init origen_map_io(void)
718{ 718{
719 exynos_init_io(NULL, 0); 719 exynos_init_io(NULL, 0);
720 s3c24xx_init_clocks(24000000); 720 s3c24xx_init_clocks(clk_xusbxti.rate);
721 s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs)); 721 s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs));
722} 722}
723 723
@@ -750,7 +750,6 @@ static void __init origen_machine_init(void)
750 origen_ehci_init(); 750 origen_ehci_init();
751 origen_ohci_init(); 751 origen_ohci_init();
752 s3c_hsotg_set_platdata(&origen_hsotg_pdata); 752 s3c_hsotg_set_platdata(&origen_hsotg_pdata);
753 clk_xusbxti.rate = 24000000;
754 753
755 s5p_tv_setup(); 754 s5p_tv_setup();
756 s5p_i2c_hdmiphy_set_platdata(NULL); 755 s5p_i2c_hdmiphy_set_platdata(NULL);
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c
index 2623f3bde3f9..737905941e85 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -295,8 +295,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = {
295 295
296static void __init smdk4x12_map_io(void) 296static void __init smdk4x12_map_io(void)
297{ 297{
298 clk_xusbxti.rate = 24000000;
299
300 exynos_init_io(NULL, 0); 298 exynos_init_io(NULL, 0);
301 s3c24xx_init_clocks(clk_xusbxti.rate); 299 s3c24xx_init_clocks(clk_xusbxti.rate);
302 s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs)); 300 s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs));
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 7464a45745d5..d5347254ed16 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -366,7 +366,7 @@ static void s5p_tv_setup(void)
366static void __init smdkv310_map_io(void) 366static void __init smdkv310_map_io(void)
367{ 367{
368 exynos_init_io(NULL, 0); 368 exynos_init_io(NULL, 0);
369 s3c24xx_init_clocks(24000000); 369 s3c24xx_init_clocks(clk_xusbxti.rate);
370 s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs)); 370 s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs));
371} 371}
372 372
@@ -403,7 +403,6 @@ static void __init smdkv310_machine_init(void)
403 smdkv310_ehci_init(); 403 smdkv310_ehci_init();
404 smdkv310_ohci_init(); 404 smdkv310_ohci_init();
405 s3c_hsotg_set_platdata(&smdkv310_hsotg_pdata); 405 s3c_hsotg_set_platdata(&smdkv310_hsotg_pdata);
406 clk_xusbxti.rate = 24000000;
407 406
408 platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); 407 platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
409} 408}
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index cd92fa86ba41..e7ba7ec1ca34 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -1100,9 +1100,8 @@ static struct platform_device *universal_devices[] __initdata = {
1100 1100
1101static void __init universal_map_io(void) 1101static void __init universal_map_io(void)
1102{ 1102{
1103 clk_xusbxti.rate = 24000000;
1104 exynos_init_io(NULL, 0); 1103 exynos_init_io(NULL, 0);
1105 s3c24xx_init_clocks(24000000); 1104 s3c24xx_init_clocks(clk_xusbxti.rate);
1106 s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); 1105 s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));
1107 s5p_set_timer_source(S5P_PWM2, S5P_PWM4); 1106 s5p_set_timer_source(S5P_PWM2, S5P_PWM4);
1108} 1107}
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)
908static void __init goni_map_io(void) 908static void __init goni_map_io(void)
909{ 909{
910 s5pv210_init_io(NULL, 0); 910 s5pv210_init_io(NULL, 0);
911 s3c24xx_init_clocks(24000000); 911 s3c24xx_init_clocks(clk_xusbxti.rate);
912 s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); 912 s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
913 s5p_set_timer_source(S5P_PWM3, S5P_PWM4); 913 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
914} 914}
@@ -966,8 +966,6 @@ static void __init goni_machine_init(void)
966 /* KEYPAD */ 966 /* KEYPAD */
967 samsung_keypad_set_platdata(&keypad_data); 967 samsung_keypad_set_platdata(&keypad_data);
968 968
969 clk_xusbxti.rate = 24000000;
970
971 platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices)); 969 platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
972} 970}
973 971
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 = {
285static void __init smdkv210_map_io(void) 285static void __init smdkv210_map_io(void)
286{ 286{
287 s5pv210_init_io(NULL, 0); 287 s5pv210_init_io(NULL, 0);
288 s3c24xx_init_clocks(24000000); 288 s3c24xx_init_clocks(clk_xusbxti.rate);
289 s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); 289 s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
290 s5p_set_timer_source(S5P_PWM2, S5P_PWM4); 290 s5p_set_timer_source(S5P_PWM2, S5P_PWM4);
291} 291}
@@ -321,7 +321,6 @@ static void __init smdkv210_machine_init(void)
321 samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data); 321 samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data);
322 322
323 s3c_hsotg_set_platdata(&smdkv210_hsotg_pdata); 323 s3c_hsotg_set_platdata(&smdkv210_hsotg_pdata);
324 clk_xusbxti.rate = 24000000;
325 324
326 platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices)); 325 platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices));
327} 326}