Commit 71984236 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki

sh: sh2 sh_clk_ops rename

Convert sh2 to use sh_clk_ops.
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent d6ef333b
...@@ -28,7 +28,7 @@ static void master_clk_init(struct clk *clk) ...@@ -28,7 +28,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pll2_mult * pll1rate[(__raw_readw(FREQCR) >> 8) & 7]; 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, .init = master_clk_init,
}; };
...@@ -38,7 +38,7 @@ static unsigned long module_clk_recalc(struct clk *clk) ...@@ -38,7 +38,7 @@ static unsigned long module_clk_recalc(struct clk *clk)
return clk->parent->rate / pfc_divisors[idx]; 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, .recalc = module_clk_recalc,
}; };
...@@ -47,22 +47,22 @@ static unsigned long bus_clk_recalc(struct clk *clk) ...@@ -47,22 +47,22 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate / pll1rate[(__raw_readw(FREQCR) >> 8) & 7]; 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, .recalc = bus_clk_recalc,
}; };
static struct clk_ops sh7619_cpu_clk_ops = { static struct sh_clk_ops sh7619_cpu_clk_ops = {
.recalc = followparent_recalc, .recalc = followparent_recalc,
}; };
static struct clk_ops *sh7619_clk_ops[] = { static struct sh_clk_ops *sh7619_clk_ops[] = {
&sh7619_master_clk_ops, &sh7619_master_clk_ops,
&sh7619_module_clk_ops, &sh7619_module_clk_ops,
&sh7619_bus_clk_ops, &sh7619_bus_clk_ops,
&sh7619_cpu_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) || if (test_mode_pin(MODE_PIN2 | MODE_PIN0) ||
test_mode_pin(MODE_PIN2 | MODE_PIN1)) test_mode_pin(MODE_PIN2 | MODE_PIN1))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment