Skip to content

Commit

Permalink
sh: clkfwk: Add a followparent_recalc() helper.
Browse files Browse the repository at this point in the history
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: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed May 11, 2009
1 parent b68d820 commit a02cb23
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 25 deletions.
2 changes: 1 addition & 1 deletion arch/sh/include/asm/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int __init arch_clk_init(void);

/* arch/sh/kernel/cpu/clock.c */
int clk_init(void);

unsigned long followparent_recalc(struct clk *clk);
void clk_recalc_rate(struct clk *);

int clk_register(struct clk *);
Expand Down
6 changes: 6 additions & 0 deletions arch/sh/kernel/cpu/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
/*
Expand Down
7 changes: 1 addition & 6 deletions arch/sh/kernel/cpu/sh2/clock-sh7619.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,8 @@ static struct clk_ops sh7619_bus_clk_ops = {
.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 = {
.recalc = cpu_clk_recalc,
.recalc = followparent_recalc,
};

static struct clk_ops *sh7619_clk_ops[] = {
Expand Down
7 changes: 1 addition & 6 deletions arch/sh/kernel/cpu/sh2a/clock-sh7203.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,8 @@ static struct clk_ops sh7203_bus_clk_ops = {
.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 = {
.recalc = cpu_clk_recalc,
.recalc = followparent_recalc,
};

static struct clk_ops *sh7203_clk_ops[] = {
Expand Down
7 changes: 1 addition & 6 deletions arch/sh/kernel/cpu/sh4a/clock-sh7722.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,15 +646,10 @@ static void sh7722_mstpcr_disable(struct clk *clk)
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 = {
.enable = sh7722_mstpcr_enable,
.disable = sh7722_mstpcr_disable,
.recalc = sh7722_mstpcr_recalc,
.recalc = followparent_recalc,
};

#define MSTPCR(_name, _parent, regnr, bitnr) \
Expand Down
7 changes: 1 addition & 6 deletions arch/sh/kernel/cpu/sh4a/clock-sh7763.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,8 @@ static struct clk_ops sh7763_bus_clk_ops = {
.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 = {
.recalc = cpu_clk_recalc,
.recalc = followparent_recalc,
};

static struct clk_ops *sh7763_clk_ops[] = {
Expand Down

0 comments on commit a02cb23

Please sign in to comment.