summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-03-20 22:00:08 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-21 23:06:18 +0100
commit6e8908edd5a140f4f0cc4338fa0420b0bb0f8efa (patch)
treef428e1725b3ee7fd295077b90d3fd491c2c61b30 /arch/arm/mach-s3c2410
parent[ARM] Convert kmalloc+memset to kzalloc (diff)
downloadlinux-6e8908edd5a140f4f0cc4338fa0420b0bb0f8efa.tar.xz
linux-6e8908edd5a140f4f0cc4338fa0420b0bb0f8efa.zip
[ARM] 3359/1: S3C24XX - add support for clk_set_rate
Patch from Ben Dooks Add support for clk_set_rate and clk_round_rate to the s3c2410 clock implementation 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')
-rw-r--r--arch/arm/mach-s3c2410/clock.c14
-rw-r--r--arch/arm/mach-s3c2410/clock.h2
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index e205a6316b08..95c6d46c3dd6 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -180,12 +180,24 @@ unsigned long clk_get_rate(struct clk *clk)
long clk_round_rate(struct clk *clk, unsigned long rate)
{
+ if (!IS_ERR(clk) && clk->round_rate)
+ return (clk->round_rate)(clk, rate);
+
return rate;
}
int clk_set_rate(struct clk *clk, unsigned long rate)
{
- return -EINVAL;
+ int ret;
+
+ if (IS_ERR(clk))
+ return -EINVAL;
+
+ mutex_lock(&clocks_mutex);
+ ret = (clk->set_rate)(clk, rate);
+ mutex_unlock(&clocks_mutex);
+
+ return ret;
}
struct clk *clk_get_parent(struct clk *clk)
diff --git a/arch/arm/mach-s3c2410/clock.h b/arch/arm/mach-s3c2410/clock.h
index c4f36f006496..32864b30c1e0 100644
--- a/arch/arm/mach-s3c2410/clock.h
+++ b/arch/arm/mach-s3c2410/clock.h
@@ -21,6 +21,8 @@ struct clk {
unsigned long ctrlbit;
int (*enable)(struct clk *, int enable);
+ int (*set_rate)(struct clk *c, unsigned long rate);
+ unsigned long (*round_rate)(struct clk *c, unsigned long rate);
int (*set_parent)(struct clk *c, struct clk *parent);
};