summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5pc1xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-18 13:24:01 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-18 15:28:28 +0900
commita0de298a0eee7f9004a8e512c12c7b40d66c9934 (patch)
treef020bb89760cc3b01d4a92685c0282c08dfebefd /arch/arm/plat-s5pc1xx
parenta4e946947b966d018f3f712d5c7ca2932c2aadd2 (diff)
downloadtalos-obmc-linux-a0de298a0eee7f9004a8e512c12c7b40d66c9934.tar.gz
talos-obmc-linux-a0de298a0eee7f9004a8e512c12c7b40d66c9934.zip
ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable
The clk_hd0 and clk_pd0 where given a local dummy_enable call due to not being registered with the clock code, which they really should have been. Register these two clocks and remove the clk_dummy_enable as this is done by the default clock registration code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s5pc1xx')
-rw-r--r--arch/arm/plat-s5pc1xx/clock.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/plat-s5pc1xx/clock.c b/arch/arm/plat-s5pc1xx/clock.c
index aec0305174aa..387f23190c3c 100644
--- a/arch/arm/plat-s5pc1xx/clock.c
+++ b/arch/arm/plat-s5pc1xx/clock.c
@@ -64,18 +64,12 @@ struct clk clk_54m = {
.rate = 54000000,
};
-static int clk_dummy_enable(struct clk *clk, int enable)
-{
- return 0;
-}
-
struct clk clk_hd0 = {
.name = "hclkd0",
.id = -1,
.rate = 0,
.parent = NULL,
.ctrlbit = 0,
- .enable = clk_dummy_enable,
.ops = &clk_ops_def_setrate,
};
@@ -86,7 +80,6 @@ struct clk clk_pd0 = {
.parent = NULL,
.ctrlbit = 0,
.ops = &clk_ops_def_setrate,
- .enable = clk_dummy_enable,
};
static int s5pc1xx_clk_gate(void __iomem *reg, struct clk *clk, int enable)
@@ -680,6 +673,8 @@ static struct clk s5pc100_init_clocks[] = {
static struct clk *clks[] __initdata = {
&clk_ext,
&clk_epll,
+ &clk_pd0,
+ &clk_hd0,
&clk_27m,
&clk_48m,
&clk_54m,
OpenPOWER on IntegriCloud