diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-13 04:38:11 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-13 04:38:11 -0400 |
commit | 253b0887b3736160feac9ccdcf146a2073e41463 (patch) | |
tree | fb7e0776555cff9275760293c10c13e8c8f365fe /arch/sh/kernel/cpu/sh4a/clock-shx3.c | |
parent | 100890c55e326a9acb4429593c5ad2012c194564 (diff) |
sh: clkfwk: Rework legacy CPG clock handling.
This moves out the old legacy CPG clocks to their own file, and converts
over the existing users. With these clocks going away and each CPU
dealing with them on their own, CPUs can gradually move over to the new
interface.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-shx3.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-shx3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-shx3.c b/arch/sh/kernel/cpu/sh4a/clock-shx3.c index c14553e3e13f..23c27d32d982 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/clock-shx3.c | |||
@@ -109,9 +109,12 @@ static struct clk *shx3_onchip_clocks[] = { | |||
109 | 109 | ||
110 | int __init arch_clk_init(void) | 110 | int __init arch_clk_init(void) |
111 | { | 111 | { |
112 | struct clk *clk = clk_get(NULL, "master_clk"); | 112 | struct clk *clk; |
113 | int i, ret = 0; | 113 | int i, ret = 0; |
114 | 114 | ||
115 | cpg_clk_init(); | ||
116 | |||
117 | clk = clk_get(NULL, "master_clk"); | ||
115 | for (i = 0; i < ARRAY_SIZE(shx3_onchip_clocks); i++) { | 118 | for (i = 0; i < ARRAY_SIZE(shx3_onchip_clocks); i++) { |
116 | struct clk *clkp = shx3_onchip_clocks[i]; | 119 | struct clk *clkp = shx3_onchip_clocks[i]; |
117 | 120 | ||