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

sh: sh4a sh_clk_ops rename

Convert sh4a SoCs 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 3b874415
...@@ -61,7 +61,7 @@ static unsigned long dll_recalc(struct clk *clk) ...@@ -61,7 +61,7 @@ static unsigned long dll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops dll_clk_ops = { static struct sh_clk_ops dll_clk_ops = {
.recalc = dll_recalc, .recalc = dll_recalc,
}; };
...@@ -81,7 +81,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -81,7 +81,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -61,7 +61,7 @@ static unsigned long dll_recalc(struct clk *clk) ...@@ -61,7 +61,7 @@ static unsigned long dll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops dll_clk_ops = { static struct sh_clk_ops dll_clk_ops = {
.recalc = dll_recalc, .recalc = dll_recalc,
}; };
...@@ -84,7 +84,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -84,7 +84,7 @@ static unsigned long pll_recalc(struct clk *clk)
return (clk->parent->rate * mult) / div; return (clk->parent->rate * mult) / div;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -64,7 +64,7 @@ static unsigned long dll_recalc(struct clk *clk) ...@@ -64,7 +64,7 @@ static unsigned long dll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops dll_clk_ops = { static struct sh_clk_ops dll_clk_ops = {
.recalc = dll_recalc, .recalc = dll_recalc,
}; };
...@@ -87,7 +87,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -87,7 +87,7 @@ static unsigned long pll_recalc(struct clk *clk)
return (clk->parent->rate * mult) / div; return (clk->parent->rate * mult) / div;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -65,7 +65,7 @@ static unsigned long dll_recalc(struct clk *clk) ...@@ -65,7 +65,7 @@ static unsigned long dll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops dll_clk_ops = { static struct sh_clk_ops dll_clk_ops = {
.recalc = dll_recalc, .recalc = dll_recalc,
}; };
...@@ -88,7 +88,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -88,7 +88,7 @@ static unsigned long pll_recalc(struct clk *clk)
return (clk->parent->rate * mult) / div; return (clk->parent->rate * mult) / div;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -70,7 +70,7 @@ static unsigned long fll_recalc(struct clk *clk) ...@@ -70,7 +70,7 @@ static unsigned long fll_recalc(struct clk *clk)
return (clk->parent->rate * mult) / div; return (clk->parent->rate * mult) / div;
} }
static struct clk_ops fll_clk_ops = { static struct sh_clk_ops fll_clk_ops = {
.recalc = fll_recalc, .recalc = fll_recalc,
}; };
...@@ -90,7 +90,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -90,7 +90,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * mult; return clk->parent->rate * mult;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
...@@ -105,7 +105,7 @@ static unsigned long div3_recalc(struct clk *clk) ...@@ -105,7 +105,7 @@ static unsigned long div3_recalc(struct clk *clk)
return clk->parent->rate / 3; return clk->parent->rate / 3;
} }
static struct clk_ops div3_clk_ops = { static struct sh_clk_ops div3_clk_ops = {
.recalc = div3_recalc, .recalc = div3_recalc,
}; };
......
...@@ -33,7 +33,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -33,7 +33,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * multiplier; return clk->parent->rate * multiplier;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -27,7 +27,7 @@ static void master_clk_init(struct clk *clk) ...@@ -27,7 +27,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= p0fc_divisors[(__raw_readl(FRQCR) >> 4) & 0x07]; clk->rate *= p0fc_divisors[(__raw_readl(FRQCR) >> 4) & 0x07];
} }
static struct clk_ops sh7763_master_clk_ops = { static struct sh_clk_ops sh7763_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
...@@ -37,7 +37,7 @@ static unsigned long module_clk_recalc(struct clk *clk) ...@@ -37,7 +37,7 @@ static unsigned long module_clk_recalc(struct clk *clk)
return clk->parent->rate / p0fc_divisors[idx]; return clk->parent->rate / p0fc_divisors[idx];
} }
static struct clk_ops sh7763_module_clk_ops = { static struct sh_clk_ops sh7763_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 / bfc_divisors[idx]; return clk->parent->rate / bfc_divisors[idx];
} }
static struct clk_ops sh7763_bus_clk_ops = { static struct sh_clk_ops sh7763_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
static struct clk_ops sh7763_cpu_clk_ops = { static struct sh_clk_ops sh7763_cpu_clk_ops = {
.recalc = followparent_recalc, .recalc = followparent_recalc,
}; };
static struct clk_ops *sh7763_clk_ops[] = { static struct sh_clk_ops *sh7763_clk_ops[] = {
&sh7763_master_clk_ops, &sh7763_master_clk_ops,
&sh7763_module_clk_ops, &sh7763_module_clk_ops,
&sh7763_bus_clk_ops, &sh7763_bus_clk_ops,
&sh7763_cpu_clk_ops, &sh7763_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(sh7763_clk_ops)) if (idx < ARRAY_SIZE(sh7763_clk_ops))
*ops = sh7763_clk_ops[idx]; *ops = sh7763_clk_ops[idx];
...@@ -74,7 +74,7 @@ static unsigned long shyway_clk_recalc(struct clk *clk) ...@@ -74,7 +74,7 @@ static unsigned long shyway_clk_recalc(struct clk *clk)
return clk->parent->rate / cfc_divisors[idx]; return clk->parent->rate / cfc_divisors[idx];
} }
static struct clk_ops sh7763_shyway_clk_ops = { static struct sh_clk_ops sh7763_shyway_clk_ops = {
.recalc = shyway_clk_recalc, .recalc = shyway_clk_recalc,
}; };
......
...@@ -24,7 +24,7 @@ static void master_clk_init(struct clk *clk) ...@@ -24,7 +24,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[(__raw_readl(FRQCR) >> 28) & 0x000f]; clk->rate *= pfc_divisors[(__raw_readl(FRQCR) >> 28) & 0x000f];
} }
static struct clk_ops sh7770_master_clk_ops = { static struct sh_clk_ops sh7770_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
...@@ -34,7 +34,7 @@ static unsigned long module_clk_recalc(struct clk *clk) ...@@ -34,7 +34,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 sh7770_module_clk_ops = { static struct sh_clk_ops sh7770_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
...@@ -44,7 +44,7 @@ static unsigned long bus_clk_recalc(struct clk *clk) ...@@ -44,7 +44,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 sh7770_bus_clk_ops = { static struct sh_clk_ops sh7770_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
...@@ -54,18 +54,18 @@ static unsigned long cpu_clk_recalc(struct clk *clk) ...@@ -54,18 +54,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 sh7770_cpu_clk_ops = { static struct sh_clk_ops sh7770_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7770_clk_ops[] = { static struct sh_clk_ops *sh7770_clk_ops[] = {
&sh7770_master_clk_ops, &sh7770_master_clk_ops,
&sh7770_module_clk_ops, &sh7770_module_clk_ops,
&sh7770_bus_clk_ops, &sh7770_bus_clk_ops,
&sh7770_cpu_clk_ops, &sh7770_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(sh7770_clk_ops)) if (idx < ARRAY_SIZE(sh7770_clk_ops))
*ops = sh7770_clk_ops[idx]; *ops = sh7770_clk_ops[idx];
......
...@@ -27,7 +27,7 @@ static void master_clk_init(struct clk *clk) ...@@ -27,7 +27,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[__raw_readl(FRQCR) & 0x0003]; clk->rate *= pfc_divisors[__raw_readl(FRQCR) & 0x0003];
} }
static struct clk_ops sh7780_master_clk_ops = { static struct sh_clk_ops sh7780_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
...@@ -37,7 +37,7 @@ static unsigned long module_clk_recalc(struct clk *clk) ...@@ -37,7 +37,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 sh7780_module_clk_ops = { static struct sh_clk_ops sh7780_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
...@@ -47,7 +47,7 @@ static unsigned long bus_clk_recalc(struct clk *clk) ...@@ -47,7 +47,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 sh7780_bus_clk_ops = { static struct sh_clk_ops sh7780_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
...@@ -57,18 +57,18 @@ static unsigned long cpu_clk_recalc(struct clk *clk) ...@@ -57,18 +57,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 sh7780_cpu_clk_ops = { static struct sh_clk_ops sh7780_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7780_clk_ops[] = { static struct sh_clk_ops *sh7780_clk_ops[] = {
&sh7780_master_clk_ops, &sh7780_master_clk_ops,
&sh7780_module_clk_ops, &sh7780_module_clk_ops,
&sh7780_bus_clk_ops, &sh7780_bus_clk_ops,
&sh7780_cpu_clk_ops, &sh7780_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(sh7780_clk_ops)) if (idx < ARRAY_SIZE(sh7780_clk_ops))
*ops = sh7780_clk_ops[idx]; *ops = sh7780_clk_ops[idx];
...@@ -80,7 +80,7 @@ static unsigned long shyway_clk_recalc(struct clk *clk) ...@@ -80,7 +80,7 @@ static unsigned long shyway_clk_recalc(struct clk *clk)
return clk->parent->rate / cfc_divisors[idx]; return clk->parent->rate / cfc_divisors[idx];
} }
static struct clk_ops sh7780_shyway_clk_ops = { static struct sh_clk_ops sh7780_shyway_clk_ops = {
.recalc = shyway_clk_recalc, .recalc = shyway_clk_recalc,
}; };
......
...@@ -36,7 +36,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -36,7 +36,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * multiplier; return clk->parent->rate * multiplier;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -38,7 +38,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -38,7 +38,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * multiplier; return clk->parent->rate * multiplier;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
...@@ -32,7 +32,7 @@ static unsigned long pll_recalc(struct clk *clk) ...@@ -32,7 +32,7 @@ static unsigned long pll_recalc(struct clk *clk)
return clk->parent->rate * 72; return clk->parent->rate * 72;
} }
static struct clk_ops pll_clk_ops = { static struct sh_clk_ops pll_clk_ops = {
.recalc = pll_recalc, .recalc = pll_recalc,
}; };
......
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