summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/clock.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-06-22 23:18:21 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-22 23:18:21 +0200
commit92b7eb8ffc0741f1fd5fbd5458a466d608310442 (patch)
tree55b34b892da1a64f62d7ae922c75fa903247e208 /arch/arm/mach-s3c2410/clock.c
parent[ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks (diff)
downloadlinux-92b7eb8ffc0741f1fd5fbd5458a466d608310442.tar.xz
linux-92b7eb8ffc0741f1fd5fbd5458a466d608310442.zip
[ARM] 3628/1: S3C24XX: add get_rate call to struct clk
Patch from Ben Dooks Add a get_rate call to allow an given clock to over-ride the clk_get_rate() call. This provides support for clocks which rely on division of their parent to correctly report their frequency when the parent can also change. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.c')
-rw-r--r--arch/arm/mach-s3c2410/clock.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index f553e5ee7477..c5c93c333ac6 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -148,8 +148,11 @@ unsigned long clk_get_rate(struct clk *clk)
if (clk->rate != 0)
return clk->rate;
- while (clk->parent != NULL && clk->rate == 0)
- clk = clk->parent;
+ if (clk->get_rate != NULL)
+ return (clk->get_rate)(clk);
+
+ if (clk->parent != NULL)
+ return clk_get_rate(clk->parent);
return clk->rate;
}