|
@@ -31,7 +31,7 @@ static void master_clk_init(struct clk *clk)
|
|
clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0007];
|
|
clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0007];
|
|
}
|
|
}
|
|
|
|
|
|
-static struct clk_ops sh4_master_clk_ops = {
|
|
|
|
|
|
+static struct sh_clk_ops sh4_master_clk_ops = {
|
|
.init = master_clk_init,
|
|
.init = master_clk_init,
|
|
};
|
|
};
|
|
|
|
|
|
@@ -41,7 +41,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 sh4_module_clk_ops = {
|
|
|
|
|
|
+static struct sh_clk_ops sh4_module_clk_ops = {
|
|
.recalc = module_clk_recalc,
|
|
.recalc = module_clk_recalc,
|
|
};
|
|
};
|
|
|
|
|
|
@@ -51,7 +51,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
|
|
return clk->parent->rate / bfc_divisors[idx];
|
|
return clk->parent->rate / bfc_divisors[idx];
|
|
}
|
|
}
|
|
|
|
|
|
-static struct clk_ops sh4_bus_clk_ops = {
|
|
|
|
|
|
+static struct sh_clk_ops sh4_bus_clk_ops = {
|
|
.recalc = bus_clk_recalc,
|
|
.recalc = bus_clk_recalc,
|
|
};
|
|
};
|
|
|
|
|
|
@@ -61,18 +61,18 @@ static unsigned long cpu_clk_recalc(struct clk *clk)
|
|
return clk->parent->rate / ifc_divisors[idx];
|
|
return clk->parent->rate / ifc_divisors[idx];
|
|
}
|
|
}
|
|
|
|
|
|
-static struct clk_ops sh4_cpu_clk_ops = {
|
|
|
|
|
|
+static struct sh_clk_ops sh4_cpu_clk_ops = {
|
|
.recalc = cpu_clk_recalc,
|
|
.recalc = cpu_clk_recalc,
|
|
};
|
|
};
|
|
|
|
|
|
-static struct clk_ops *sh4_clk_ops[] = {
|
|
|
|
|
|
+static struct sh_clk_ops *sh4_clk_ops[] = {
|
|
&sh4_master_clk_ops,
|
|
&sh4_master_clk_ops,
|
|
&sh4_module_clk_ops,
|
|
&sh4_module_clk_ops,
|
|
&sh4_bus_clk_ops,
|
|
&sh4_bus_clk_ops,
|
|
&sh4_cpu_clk_ops,
|
|
&sh4_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 (idx < ARRAY_SIZE(sh4_clk_ops))
|
|
if (idx < ARRAY_SIZE(sh4_clk_ops))
|
|
*ops = sh4_clk_ops[idx];
|
|
*ops = sh4_clk_ops[idx];
|