diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-25 01:59:26 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-25 01:59:26 -0400 |
commit | a60977a51333a8108f0574aa26094d66b7fedf34 (patch) | |
tree | d3abf6c5ae29d91abf79d79c9fa6dad2881e5532 /include/linux/sh_clk.h | |
parent | 07acfc2a9349a8ce45b236c2624dad452001966b (diff) |
sh: clkfwk: Move to common clk_div_table accessors for div4/div6.
This plugs in a generic clk_div_table, based on the div4 version. div6 is
then adopted to use it for encapsulating its div table, which permits us
to start div6/4 unification, as well as preparation for other div types.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/sh_clk.h')
-rw-r--r-- | include/linux/sh_clk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index c513b73cd7cb..706b803df7b7 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -18,7 +18,6 @@ struct clk_mapping { | |||
18 | struct kref ref; | 18 | struct kref ref; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | |||
22 | struct sh_clk_ops { | 21 | struct sh_clk_ops { |
23 | #ifdef CONFIG_SH_CLK_CPG_LEGACY | 22 | #ifdef CONFIG_SH_CLK_CPG_LEGACY |
24 | void (*init)(struct clk *clk); | 23 | void (*init)(struct clk *clk); |
@@ -149,11 +148,13 @@ static inline int __deprecated sh_clk_mstp32_register(struct clk *clks, int nr) | |||
149 | .flags = _flags, \ | 148 | .flags = _flags, \ |
150 | } | 149 | } |
151 | 150 | ||
152 | struct clk_div4_table { | 151 | struct clk_div_table { |
153 | struct clk_div_mult_table *div_mult_table; | 152 | struct clk_div_mult_table *div_mult_table; |
154 | void (*kick)(struct clk *clk); | 153 | void (*kick)(struct clk *clk); |
155 | }; | 154 | }; |
156 | 155 | ||
156 | #define clk_div4_table clk_div_table | ||
157 | |||
157 | int sh_clk_div4_register(struct clk *clks, int nr, | 158 | int sh_clk_div4_register(struct clk *clks, int nr, |
158 | struct clk_div4_table *table); | 159 | struct clk_div4_table *table); |
159 | int sh_clk_div4_enable_register(struct clk *clks, int nr, | 160 | int sh_clk_div4_enable_register(struct clk *clks, int nr, |