summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/timers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-12-01 13:15:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-12-06 10:45:40 +0900
commit1d118562c2067a42d0e8f70671a4ce27d7c6ffee (patch)
treefa59028397143d7fa94d86785bee8443efe30798 /arch/sh/kernel/timers
parente74b56800e78a10bc09b56a87831876a1d9d09ae (diff)
downloadop-kernel-dev-1d118562c2067a42d0e8f70671a4ce27d7c6ffee.zip
op-kernel-dev-1d118562c2067a42d0e8f70671a4ce27d7c6ffee.tar.gz
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')
-rw-r--r--arch/sh/kernel/timers/timer-cmt.c4
-rw-r--r--arch/sh/kernel/timers/timer-mtu2.c2
-rw-r--r--arch/sh/kernel/timers/timer-tmu.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c
index 95581dc..a574b93 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)
u8 divisor = CMT_CMCSR_INIT & 0x3;
ctrl_inw(CMT_CMCSR_0);
ctrl_outw(CMT_CMCSR_INIT, CMT_CMCSR_0);
- clk->parent = clk_get("module_clk");
+ clk->parent = clk_get(NULL, "module_clk");
clk->rate = clk->parent->rate / (8 << (divisor << 1));
}
@@ -164,7 +164,7 @@ static int cmt_timer_init(void)
setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
- cmt0_clk.parent = clk_get("module_clk");
+ cmt0_clk.parent = clk_get(NULL, "module_clk");
cmt_timer_stop();
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index 201f0a6..fffcd1c 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -161,7 +161,7 @@ static int mtu2_timer_init(void)
setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);
- mtu2_clk1.parent = clk_get("module_clk");
+ mtu2_clk1.parent = clk_get(NULL, "module_clk");
ctrl_outb(ctrl_inb(STBCR3) & (~0x20), STBCR3);
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index b9ed8a3..e060e71 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -144,7 +144,7 @@ static int tmu_timer_init(void)
setup_irq(CONFIG_SH_TIMER_IRQ, &tmu_irq);
- tmu0_clk.parent = clk_get("module_clk");
+ tmu0_clk.parent = clk_get(NULL, "module_clk");
/* Start TMU0 */
tmu_timer_stop();
OpenPOWER on IntegriCloud