Commit a02cb230 authored by Paul Mundt's avatar Paul Mundt

sh: clkfwk: Add a followparent_recalc() helper.

This adds a followparent_recalc() helper for clocks that just follow the
parent's rate. Switch over the few CPUs that use this scheme for some of
their clocks.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b68d8201
...@@ -44,7 +44,7 @@ int __init arch_clk_init(void); ...@@ -44,7 +44,7 @@ int __init arch_clk_init(void);
/* arch/sh/kernel/cpu/clock.c */ /* arch/sh/kernel/cpu/clock.c */
int clk_init(void); int clk_init(void);
unsigned long followparent_recalc(struct clk *clk);
void clk_recalc_rate(struct clk *); void clk_recalc_rate(struct clk *);
int clk_register(struct clk *); int clk_register(struct clk *);
......
...@@ -90,6 +90,12 @@ static void propagate_rate(struct clk *clk) ...@@ -90,6 +90,12 @@ static void propagate_rate(struct clk *clk)
} }
} }
/* Used for clocks that always have same value as the parent clock */
unsigned long followparent_recalc(struct clk *clk)
{
return clk->parent->rate;
}
static void __clk_init(struct clk *clk) static void __clk_init(struct clk *clk)
{ {
/* /*
......
...@@ -57,13 +57,8 @@ static struct clk_ops sh7619_bus_clk_ops = { ...@@ -57,13 +57,8 @@ static struct clk_ops sh7619_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
static unsigned long cpu_clk_recalc(struct clk *clk)
{
return clk->parent->rate;
}
static struct clk_ops sh7619_cpu_clk_ops = { static struct clk_ops sh7619_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = followparent_recalc,
}; };
static struct clk_ops *sh7619_clk_ops[] = { static struct clk_ops *sh7619_clk_ops[] = {
......
...@@ -66,13 +66,8 @@ static struct clk_ops sh7203_bus_clk_ops = { ...@@ -66,13 +66,8 @@ static struct clk_ops sh7203_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
static unsigned long cpu_clk_recalc(struct clk *clk)
{
return clk->parent->rate;
}
static struct clk_ops sh7203_cpu_clk_ops = { static struct clk_ops sh7203_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = followparent_recalc,
}; };
static struct clk_ops *sh7203_clk_ops[] = { static struct clk_ops *sh7203_clk_ops[] = {
......
...@@ -646,15 +646,10 @@ static void sh7722_mstpcr_disable(struct clk *clk) ...@@ -646,15 +646,10 @@ static void sh7722_mstpcr_disable(struct clk *clk)
sh7722_mstpcr_start_stop(clk, 0); sh7722_mstpcr_start_stop(clk, 0);
} }
static unsigned long sh7722_mstpcr_recalc(struct clk *clk)
{
return clk->parent->rate;
}
static struct clk_ops sh7722_mstpcr_clk_ops = { static struct clk_ops sh7722_mstpcr_clk_ops = {
.enable = sh7722_mstpcr_enable, .enable = sh7722_mstpcr_enable,
.disable = sh7722_mstpcr_disable, .disable = sh7722_mstpcr_disable,
.recalc = sh7722_mstpcr_recalc, .recalc = followparent_recalc,
}; };
#define MSTPCR(_name, _parent, regnr, bitnr) \ #define MSTPCR(_name, _parent, regnr, bitnr) \
......
...@@ -49,13 +49,8 @@ static struct clk_ops sh7763_bus_clk_ops = { ...@@ -49,13 +49,8 @@ static struct clk_ops sh7763_bus_clk_ops = {
.recalc = bus_clk_recalc, .recalc = bus_clk_recalc,
}; };
static unsigned long cpu_clk_recalc(struct clk *clk)
{
return clk->parent->rate;
}
static struct clk_ops sh7763_cpu_clk_ops = { static struct clk_ops sh7763_cpu_clk_ops = {
.recalc = cpu_clk_recalc, .recalc = followparent_recalc,
}; };
static struct clk_ops *sh7763_clk_ops[] = { static struct clk_ops *sh7763_clk_ops[] = {
......
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