aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sh_clk.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-05-25 14:59:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-05-25 14:59:26 +0900
commita60977a51333a8108f0574aa26094d66b7fedf34 (patch)
treed3abf6c5ae29d91abf79d79c9fa6dad2881e5532 /include/linux/sh_clk.h
parentMerge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
downloadlinux-dev-a60977a51333a8108f0574aa26094d66b7fedf34.tar.xz
linux-dev-a60977a51333a8108f0574aa26094d66b7fedf34.zip
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.h5
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 {
struct kref ref;
};
-
struct sh_clk_ops {
#ifdef CONFIG_SH_CLK_CPG_LEGACY
void (*init)(struct clk *clk);
@@ -149,11 +148,13 @@ static inline int __deprecated sh_clk_mstp32_register(struct clk *clks, int nr)
.flags = _flags, \
}
-struct clk_div4_table {
+struct clk_div_table {
struct clk_div_mult_table *div_mult_table;
void (*kick)(struct clk *clk);
};
+#define clk_div4_table clk_div_table
+
int sh_clk_div4_register(struct clk *clks, int nr,
struct clk_div4_table *table);
int sh_clk_div4_enable_register(struct clk *clks, int nr,