diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-17 23:24:01 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 01:28:28 -0500 |
commit | a0de298a0eee7f9004a8e512c12c7b40d66c9934 (patch) | |
tree | f020bb89760cc3b01d4a92685c0282c08dfebefd | |
parent | a4e946947b966d018f3f712d5c7ca2932c2aadd2 (diff) |
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>
-rw-r--r-- | arch/arm/plat-s5pc1xx/clock.c | 9 |
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 = { | |||
64 | .rate = 54000000, | 64 | .rate = 54000000, |
65 | }; | 65 | }; |
66 | 66 | ||
67 | static int clk_dummy_enable(struct clk *clk, int enable) | ||
68 | { | ||
69 | return 0; | ||
70 | } | ||
71 | |||
72 | struct clk clk_hd0 = { | 67 | struct clk clk_hd0 = { |
73 | .name = "hclkd0", | 68 | .name = "hclkd0", |
74 | .id = -1, | 69 | .id = -1, |
75 | .rate = 0, | 70 | .rate = 0, |
76 | .parent = NULL, | 71 | .parent = NULL, |
77 | .ctrlbit = 0, | 72 | .ctrlbit = 0, |
78 | .enable = clk_dummy_enable, | ||
79 | .ops = &clk_ops_def_setrate, | 73 | .ops = &clk_ops_def_setrate, |
80 | }; | 74 | }; |
81 | 75 | ||
@@ -86,7 +80,6 @@ struct clk clk_pd0 = { | |||
86 | .parent = NULL, | 80 | .parent = NULL, |
87 | .ctrlbit = 0, | 81 | .ctrlbit = 0, |
88 | .ops = &clk_ops_def_setrate, | 82 | .ops = &clk_ops_def_setrate, |
89 | .enable = clk_dummy_enable, | ||
90 | }; | 83 | }; |
91 | 84 | ||
92 | static int s5pc1xx_clk_gate(void __iomem *reg, struct clk *clk, int enable) | 85 | static int s5pc1xx_clk_gate(void __iomem *reg, struct clk *clk, int enable) |
@@ -680,6 +673,8 @@ static struct clk s5pc100_init_clocks[] = { | |||
680 | static struct clk *clks[] __initdata = { | 673 | static struct clk *clks[] __initdata = { |
681 | &clk_ext, | 674 | &clk_ext, |
682 | &clk_epll, | 675 | &clk_epll, |
676 | &clk_pd0, | ||
677 | &clk_hd0, | ||
683 | &clk_27m, | 678 | &clk_27m, |
684 | &clk_48m, | 679 | &clk_48m, |
685 | &clk_54m, | 680 | &clk_54m, |