diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7763.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c index 3177d0d1e06d..26630fb190c7 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c | |||
@@ -29,29 +29,29 @@ static struct clk_ops sh7763_master_clk_ops = { | |||
29 | .init = master_clk_init, | 29 | .init = master_clk_init, |
30 | }; | 30 | }; |
31 | 31 | ||
32 | static void module_clk_recalc(struct clk *clk) | 32 | static unsigned long module_clk_recalc(struct clk *clk) |
33 | { | 33 | { |
34 | int idx = ((ctrl_inl(FRQCR) >> 4) & 0x07); | 34 | int idx = ((ctrl_inl(FRQCR) >> 4) & 0x07); |
35 | clk->rate = clk->parent->rate / p0fc_divisors[idx]; | 35 | return clk->parent->rate / p0fc_divisors[idx]; |
36 | } | 36 | } |
37 | 37 | ||
38 | static struct clk_ops sh7763_module_clk_ops = { | 38 | static struct clk_ops sh7763_module_clk_ops = { |
39 | .recalc = module_clk_recalc, | 39 | .recalc = module_clk_recalc, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static void bus_clk_recalc(struct clk *clk) | 42 | static unsigned long bus_clk_recalc(struct clk *clk) |
43 | { | 43 | { |
44 | int idx = ((ctrl_inl(FRQCR) >> 16) & 0x07); | 44 | int idx = ((ctrl_inl(FRQCR) >> 16) & 0x07); |
45 | clk->rate = clk->parent->rate / bfc_divisors[idx]; | 45 | return clk->parent->rate / bfc_divisors[idx]; |
46 | } | 46 | } |
47 | 47 | ||
48 | static struct clk_ops sh7763_bus_clk_ops = { | 48 | static struct clk_ops sh7763_bus_clk_ops = { |
49 | .recalc = bus_clk_recalc, | 49 | .recalc = bus_clk_recalc, |
50 | }; | 50 | }; |
51 | 51 | ||
52 | static void cpu_clk_recalc(struct clk *clk) | 52 | static unsigned long cpu_clk_recalc(struct clk *clk) |
53 | { | 53 | { |
54 | clk->rate = clk->parent->rate; | 54 | return clk->parent->rate; |
55 | } | 55 | } |
56 | 56 | ||
57 | static struct clk_ops sh7763_cpu_clk_ops = { | 57 | static struct clk_ops sh7763_cpu_clk_ops = { |
@@ -71,10 +71,10 @@ void __init arch_init_clk_ops(struct clk_ops **ops, int idx) | |||
71 | *ops = sh7763_clk_ops[idx]; | 71 | *ops = sh7763_clk_ops[idx]; |
72 | } | 72 | } |
73 | 73 | ||
74 | static void shyway_clk_recalc(struct clk *clk) | 74 | static unsigned long shyway_clk_recalc(struct clk *clk) |
75 | { | 75 | { |
76 | int idx = ((ctrl_inl(FRQCR) >> 20) & 0x07); | 76 | int idx = ((ctrl_inl(FRQCR) >> 20) & 0x07); |
77 | clk->rate = clk->parent->rate / cfc_divisors[idx]; | 77 | return clk->parent->rate / cfc_divisors[idx]; |
78 | } | 78 | } |
79 | 79 | ||
80 | static struct clk_ops sh7763_shyway_clk_ops = { | 80 | static struct clk_ops sh7763_shyway_clk_ops = { |