summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Abraham <thomas.ab@samsung.com>2009-09-08 07:30:48 +0200
committerBen Dooks <ben-linux@fluff.org>2009-09-16 01:50:05 +0200
commit6d025ac2fcf9d736ee399efddae74a3362dfa7da (patch)
tree2d46f3023f737c8e8e9af708c22123dd7cd32d6c /arch
parentARM: S3C6410: use correct divider_shift in setrate_clksrc() (diff)
downloadlinux-6d025ac2fcf9d736ee399efddae74a3362dfa7da.tar.xz
linux-6d025ac2fcf9d736ee399efddae74a3362dfa7da.zip
ARM: S3C6410: update clk->parent when setting clock source
This ensures the clock hierarchy data structures are updated when we change the clock source in the actual hardware registers. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> [ben-linux@fluff.org: Minor re-indentation of subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index c972d2f8c271..54eef9326c21 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -328,6 +328,8 @@ static int s3c64xx_setparent_clksrc(struct clk *clk, struct clk *parent)
clksrc |= src_nr << sclk->shift;
__raw_writel(clksrc, S3C_CLK_SRC);
+
+ clk->parent = parent;
return 0;
}