* [PATCH 10/17] sh: sh2 sh_clk_ops rename
@ 2012-02-29 13:17 Magnus Damm
0 siblings, 0 replies; only message in thread
From: Magnus Damm @ 2012-02-29 13:17 UTC (permalink / raw)
To: linux-sh
From: Magnus Damm <damm@opensource.se>
Convert sh2 to use sh_clk_ops.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/sh/kernel/cpu/sh2/clock-sh7619.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- 0001/arch/sh/kernel/cpu/sh2/clock-sh7619.c
+++ work/arch/sh/kernel/cpu/sh2/clock-sh7619.c 2012-02-29 20:47:02.000000000 +0900
@@ -28,7 +28,7 @@ static void master_clk_init(struct clk *
clk->rate *= pll2_mult * pll1rate[(__raw_readw(FREQCR) >> 8) & 7];
}
-static struct clk_ops sh7619_master_clk_ops = {
+static struct sh_clk_ops sh7619_master_clk_ops = {
.init = master_clk_init,
};
@@ -38,7 +38,7 @@ static unsigned long module_clk_recalc(s
return clk->parent->rate / pfc_divisors[idx];
}
-static struct clk_ops sh7619_module_clk_ops = {
+static struct sh_clk_ops sh7619_module_clk_ops = {
.recalc = module_clk_recalc,
};
@@ -47,22 +47,22 @@ static unsigned long bus_clk_recalc(stru
return clk->parent->rate / pll1rate[(__raw_readw(FREQCR) >> 8) & 7];
}
-static struct clk_ops sh7619_bus_clk_ops = {
+static struct sh_clk_ops sh7619_bus_clk_ops = {
.recalc = bus_clk_recalc,
};
-static struct clk_ops sh7619_cpu_clk_ops = {
+static struct sh_clk_ops sh7619_cpu_clk_ops = {
.recalc = followparent_recalc,
};
-static struct clk_ops *sh7619_clk_ops[] = {
+static struct sh_clk_ops *sh7619_clk_ops[] = {
&sh7619_master_clk_ops,
&sh7619_module_clk_ops,
&sh7619_bus_clk_ops,
&sh7619_cpu_clk_ops,
};
-void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
{
if (test_mode_pin(MODE_PIN2 | MODE_PIN0) ||
test_mode_pin(MODE_PIN2 | MODE_PIN1))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-02-29 13:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 13:17 [PATCH 10/17] sh: sh2 sh_clk_ops rename Magnus Damm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).