diff options
| author | Ben Dooks | 2010-01-19 18:36:12 +0900 |
|---|---|---|
| committer | Ben Dooks | 2010-01-19 18:36:12 +0900 |
| commit | ea2de1dc8b5872de21a03757dca9d1560b5c9a81 (patch) | |
| tree | 5501528ce36e2cbfff47ea5ffb1398f5d98ff330 /arch/arm/plat-s5pc1xx | |
| parent | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (diff) | |
| parent | f9e011b6b305d38445bbd4a1e7a8814e056de37b (diff) | |
ARM: Merge next-samsung-clock2
Merge branch 'next-samsung-clock2' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-s5pc1xx')
| -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 = { .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, |