sh: sh3 sh_clk_ops rename

Convert sh3 SoCs to use sh_clk_ops.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Magnus Damm 2012-02-29 22:17:40 +09:00 committed by Rafael J. Wysocki
parent 4ad2c06155
commit 43ebacd00a
6 changed files with 35 additions and 35 deletions

View File

@ -34,7 +34,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[idx]; clk->rate *= pfc_divisors[idx];
} }
static struct clk_ops sh3_master_clk_ops = { static struct sh_clk_ops sh3_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
@ -46,7 +46,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 sh3_module_clk_ops = { static struct sh_clk_ops sh3_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -58,7 +58,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate / stc_multipliers[idx]; return clk->parent->rate / stc_multipliers[idx];
} }
static struct clk_ops sh3_bus_clk_ops = { static struct sh_clk_ops sh3_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
@ -70,18 +70,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 sh3_cpu_clk_ops = { static struct sh_clk_ops sh3_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh3_clk_ops[] = { static struct sh_clk_ops *sh3_clk_ops[] = {
&sh3_master_clk_ops, &sh3_master_clk_ops,
&sh3_module_clk_ops, &sh3_module_clk_ops,
&sh3_bus_clk_ops, &sh3_bus_clk_ops,
&sh3_cpu_clk_ops, &sh3_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(sh3_clk_ops)) if (idx < ARRAY_SIZE(sh3_clk_ops))
*ops = sh3_clk_ops[idx]; *ops = sh3_clk_ops[idx];

View File

@ -35,7 +35,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0003]; clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0003];
} }
static struct clk_ops sh7705_master_clk_ops = { static struct sh_clk_ops sh7705_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
@ -45,7 +45,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 sh7705_module_clk_ops = { static struct sh_clk_ops sh7705_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -55,7 +55,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate / stc_multipliers[idx]; return clk->parent->rate / stc_multipliers[idx];
} }
static struct clk_ops sh7705_bus_clk_ops = { static struct sh_clk_ops sh7705_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
@ -65,18 +65,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 sh7705_cpu_clk_ops = { static struct sh_clk_ops sh7705_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7705_clk_ops[] = { static struct sh_clk_ops *sh7705_clk_ops[] = {
&sh7705_master_clk_ops, &sh7705_master_clk_ops,
&sh7705_module_clk_ops, &sh7705_module_clk_ops,
&sh7705_bus_clk_ops, &sh7705_bus_clk_ops,
&sh7705_cpu_clk_ops, &sh7705_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(sh7705_clk_ops)) if (idx < ARRAY_SIZE(sh7705_clk_ops))
*ops = sh7705_clk_ops[idx]; *ops = sh7705_clk_ops[idx];

View File

@ -30,7 +30,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[idx]; clk->rate *= pfc_divisors[idx];
} }
static struct clk_ops sh7706_master_clk_ops = { static struct sh_clk_ops sh7706_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
@ -42,7 +42,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 sh7706_module_clk_ops = { static struct sh_clk_ops sh7706_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -54,7 +54,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate / stc_multipliers[idx]; return clk->parent->rate / stc_multipliers[idx];
} }
static struct clk_ops sh7706_bus_clk_ops = { static struct sh_clk_ops sh7706_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
@ -66,18 +66,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 sh7706_cpu_clk_ops = { static struct sh_clk_ops sh7706_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7706_clk_ops[] = { static struct sh_clk_ops *sh7706_clk_ops[] = {
&sh7706_master_clk_ops, &sh7706_master_clk_ops,
&sh7706_module_clk_ops, &sh7706_module_clk_ops,
&sh7706_bus_clk_ops, &sh7706_bus_clk_ops,
&sh7706_cpu_clk_ops, &sh7706_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(sh7706_clk_ops)) if (idx < ARRAY_SIZE(sh7706_clk_ops))
*ops = sh7706_clk_ops[idx]; *ops = sh7706_clk_ops[idx];

View File

@ -30,7 +30,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= pfc_divisors[idx]; clk->rate *= pfc_divisors[idx];
} }
static struct clk_ops sh7709_master_clk_ops = { static struct sh_clk_ops sh7709_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
@ -42,7 +42,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 sh7709_module_clk_ops = { static struct sh_clk_ops sh7709_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -55,7 +55,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate * stc_multipliers[idx]; return clk->parent->rate * stc_multipliers[idx];
} }
static struct clk_ops sh7709_bus_clk_ops = { static struct sh_clk_ops sh7709_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
@ -67,18 +67,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 sh7709_cpu_clk_ops = { static struct sh_clk_ops sh7709_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7709_clk_ops[] = { static struct sh_clk_ops *sh7709_clk_ops[] = {
&sh7709_master_clk_ops, &sh7709_master_clk_ops,
&sh7709_module_clk_ops, &sh7709_module_clk_ops,
&sh7709_bus_clk_ops, &sh7709_bus_clk_ops,
&sh7709_cpu_clk_ops, &sh7709_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(sh7709_clk_ops)) if (idx < ARRAY_SIZE(sh7709_clk_ops))
*ops = sh7709_clk_ops[idx]; *ops = sh7709_clk_ops[idx];

View File

@ -29,7 +29,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= md_table[__raw_readw(FRQCR) & 0x0007]; clk->rate *= md_table[__raw_readw(FRQCR) & 0x0007];
} }
static struct clk_ops sh7710_master_clk_ops = { static struct sh_clk_ops sh7710_master_clk_ops = {
.init = master_clk_init, .init = master_clk_init,
}; };
@ -39,7 +39,7 @@ static unsigned long module_clk_recalc(struct clk *clk)
return clk->parent->rate / md_table[idx]; return clk->parent->rate / md_table[idx];
} }
static struct clk_ops sh7710_module_clk_ops = { static struct sh_clk_ops sh7710_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -49,7 +49,7 @@ static unsigned long bus_clk_recalc(struct clk *clk)
return clk->parent->rate / md_table[idx]; return clk->parent->rate / md_table[idx];
} }
static struct clk_ops sh7710_bus_clk_ops = { static struct sh_clk_ops sh7710_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
@ -59,18 +59,18 @@ static unsigned long cpu_clk_recalc(struct clk *clk)
return clk->parent->rate / md_table[idx]; return clk->parent->rate / md_table[idx];
} }
static struct clk_ops sh7710_cpu_clk_ops = { static struct sh_clk_ops sh7710_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7710_clk_ops[] = { static struct sh_clk_ops *sh7710_clk_ops[] = {
&sh7710_master_clk_ops, &sh7710_master_clk_ops,
&sh7710_module_clk_ops, &sh7710_module_clk_ops,
&sh7710_bus_clk_ops, &sh7710_bus_clk_ops,
&sh7710_cpu_clk_ops, &sh7710_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(sh7710_clk_ops)) if (idx < ARRAY_SIZE(sh7710_clk_ops))
*ops = sh7710_clk_ops[idx]; *ops = sh7710_clk_ops[idx];

View File

@ -29,7 +29,7 @@ static void master_clk_init(struct clk *clk)
clk->rate *= multipliers[idx]; clk->rate *= multipliers[idx];
} }
static struct clk_ops sh7712_master_clk_ops = { static struct sh_clk_ops sh7712_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 / divisors[idx]; return clk->parent->rate / divisors[idx];
} }
static struct clk_ops sh7712_module_clk_ops = { static struct sh_clk_ops sh7712_module_clk_ops = {
.recalc = module_clk_recalc, .recalc = module_clk_recalc,
}; };
@ -53,17 +53,17 @@ static unsigned long cpu_clk_recalc(struct clk *clk)
return clk->parent->rate / divisors[idx]; return clk->parent->rate / divisors[idx];
} }
static struct clk_ops sh7712_cpu_clk_ops = { static struct sh_clk_ops sh7712_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = cpu_clk_recalc,
}; };
static struct clk_ops *sh7712_clk_ops[] = { static struct sh_clk_ops *sh7712_clk_ops[] = {
&sh7712_master_clk_ops, &sh7712_master_clk_ops,
&sh7712_module_clk_ops, &sh7712_module_clk_ops,
&sh7712_cpu_clk_ops, &sh7712_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(sh7712_clk_ops)) if (idx < ARRAY_SIZE(sh7712_clk_ops))
*ops = sh7712_clk_ops[idx]; *ops = sh7712_clk_ops[idx];