aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/clock-cpg.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-19 04:26:56 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-02-22 05:11:22 -0500
commit7be85c6eb4462cd973e680d9dcf897a7b5b26165 (patch)
tree5da0ed4f9d6e24676cca7db071ba3380ee6c0cd7 /arch/sh/kernel/cpu/clock-cpg.c
parent0a5f337ecd20e70e84a5cfc0f2c24d0366087026 (diff)
sh: add sh7724 kick callback to clk_div4_table
This patch adds a ->kick() callback to clk_div4_table and ties it into sh_clk_div4_set_rate(). A sh7724 specific kick function is also added that updates the KICK bit whenever div4 clocks in FRQCRA and FRQCRB have been set. Allows us to set the VPU clock. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/clock-cpg.c')
-rw-r--r--arch/sh/kernel/cpu/clock-cpg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 1fc8a0e50603..eed5eaff96ba 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -188,6 +188,7 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)
188 188
189static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id) 189static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id)
190{ 190{
191 struct clk_div4_table *d4t = clk->priv;
191 unsigned long value; 192 unsigned long value;
192 int idx = clk_rate_table_find(clk, clk->freq_table, rate); 193 int idx = clk_rate_table_find(clk, clk->freq_table, rate);
193 if (idx < 0) 194 if (idx < 0)
@@ -198,6 +199,9 @@ static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id
198 value |= (idx << clk->enable_bit); 199 value |= (idx << clk->enable_bit);
199 __raw_writel(value, clk->enable_reg); 200 __raw_writel(value, clk->enable_reg);
200 201
202 if (d4t->kick)
203 d4t->kick(clk);
204
201 return 0; 205 return 0;
202} 206}
203 207