diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-11-30 23:15:14 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-05 20:45:40 -0500 |
commit | 1d118562c2067a42d0e8f70671a4ce27d7c6ffee (patch) | |
tree | fa59028397143d7fa94d86785bee8443efe30798 /arch/sh/kernel/timers/timer-cmt.c | |
parent | e74b56800e78a10bc09b56a87831876a1d9d09ae (diff) |
sh: Clock framework tidying.
This syncs up the SH clock framework with the linux/clk.h API,
for which there were only some minor changes required, namely
the clk_get() dev_id and subsequent callsites.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/timers/timer-cmt.c')
-rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c index 95581dccbbfd..a574b93a4e7b 100644 --- a/arch/sh/kernel/timers/timer-cmt.c +++ b/arch/sh/kernel/timers/timer-cmt.c | |||
@@ -124,7 +124,7 @@ static void cmt_clk_init(struct clk *clk) | |||
124 | u8 divisor = CMT_CMCSR_INIT & 0x3; | 124 | u8 divisor = CMT_CMCSR_INIT & 0x3; |
125 | ctrl_inw(CMT_CMCSR_0); | 125 | ctrl_inw(CMT_CMCSR_0); |
126 | ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0); | 126 | ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0); |
127 | clk->parent = clk_get("module_clk"); | 127 | clk->parent = clk_get(NULL, "module_clk"); |
128 | clk->rate = clk->parent->rate / (8 << (divisor << 1)); | 128 | clk->rate = clk->parent->rate / (8 << (divisor << 1)); |
129 | } | 129 | } |
130 | 130 | ||
@@ -164,7 +164,7 @@ static int cmt_timer_init(void) | |||
164 | 164 | ||
165 | setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq); | 165 | setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq); |
166 | 166 | ||
167 | cmt0_clk.parent = clk_get("module_clk"); | 167 | cmt0_clk.parent = clk_get(NULL, "module_clk"); |
168 | 168 | ||
169 | cmt_timer_stop(); | 169 | cmt_timer_stop(); |
170 | 170 | ||