aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c64xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-12-08 19:08:35 -0500
committerBen Dooks <ben-linux@fluff.org>2010-01-15 03:10:10 -0500
commit682e2b7d45878586ce84f6993da0b8a2981a399d (patch)
tree7d64665810dd9d2783067714e49f4c51c752b57b /arch/arm/plat-s3c64xx
parentf3e0b724cc70ef5ee2a6e0d9dfafa2328c294ab3 (diff)
ARM: S3C64XX: Avoid announcing clksrc clocks twice
The new code calls the clock setup code on registration which can be before the clock system has been fully initialised. The following code re-does this setup at the end of the clock registration and thus we get two printings. Update the calls to only print on the last pass or when doing the necessary resume work. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx')
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 555d1aa6b5ac..cb2bf4bff051 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -486,10 +486,10 @@ void __init_or_cpufreq s3c6400_setup_clocks(void)
486 clk_f.rate = fclk; 486 clk_f.rate = fclk;
487 487
488 for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++) 488 for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++)
489 s3c_set_clksrc(init_parents[ptr]); 489 s3c_set_clksrc(init_parents[ptr], true);
490 490
491 for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) 491 for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
492 s3c_set_clksrc(&clksrcs[ptr]); 492 s3c_set_clksrc(&clksrcs[ptr], true);
493} 493}
494 494
495static struct clk *clks[] __initdata = { 495static struct clk *clks[] __initdata = {