diff options
author | Ben Dooks <ben-linux@fluff.org> | 2006-06-22 21:18:21 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-22 21:18:21 (GMT) |
commit | 92b7eb8ffc0741f1fd5fbd5458a466d608310442 (patch) | |
tree | 55b34b892da1a64f62d7ae922c75fa903247e208 /arch | |
parent | 99c13853ffa26dd6527995b3f47548e075f201fb (diff) | |
download | linux-fsl-qoriq-92b7eb8ffc0741f1fd5fbd5458a466d608310442.tar.xz |
[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')
-rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/clock.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index f553e5e..c5c93c3 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; } diff --git a/arch/arm/mach-s3c2410/clock.h b/arch/arm/mach-s3c2410/clock.h index 1bee570..9456c81 100644 --- a/arch/arm/mach-s3c2410/clock.h +++ b/arch/arm/mach-s3c2410/clock.h @@ -22,6 +22,7 @@ struct clk { int (*enable)(struct clk *, int enable); int (*set_rate)(struct clk *c, unsigned long rate); + unsigned long (*get_rate)(struct clk *c); unsigned long (*round_rate)(struct clk *c, unsigned long rate); int (*set_parent)(struct clk *c, struct clk *parent); }; |