diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-16 04:11:20 +0300 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-16 04:11:20 +0300 |
commit | 849653372d3f98332bf84e9fb814d9f9a02eeda2 (patch) | |
tree | 0ccb6899ceb664024cc98ddfdf4b55572c45ec32 /include | |
parent | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (diff) | |
parent | 549015c36baadc6e67861bba6e927259e34c4d59 (diff) | |
download | linux-849653372d3f98332bf84e9fb814d9f9a02eeda2.tar.xz |
Merge branch 'common/clkfwk' into sh-fixes-for-linus
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sh_clk.h | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index cea0c38e7a63..9a52f72527dc 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h @@ -19,11 +19,13 @@ struct clk_mapping { }; struct clk_ops { +#ifdef CONFIG_SH_CLK_CPG_LEGACY void (*init)(struct clk *clk); +#endif int (*enable)(struct clk *clk); void (*disable)(struct clk *clk); unsigned long (*recalc)(struct clk *clk); - int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id); + int (*set_rate)(struct clk *clk, unsigned long rate); int (*set_parent)(struct clk *clk, struct clk *parent); long (*round_rate)(struct clk *clk, unsigned long rate); }; @@ -67,36 +69,6 @@ int clk_register(struct clk *); void clk_unregister(struct clk *); void clk_enable_init_clocks(void); -/** - * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter - * @clk: clock source - * @rate: desired clock rate in Hz - * @algo_id: algorithm id to be passed down to ops->set_rate - * - * Returns success (0) or negative errno. - */ -int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id); - -enum clk_sh_algo_id { - NO_CHANGE = 0, - - IUS_N1_N1, - IUS_322, - IUS_522, - IUS_N11, - - SB_N1, - - SB3_N1, - SB3_32, - SB3_43, - SB3_54, - - BP_N1, - - IP_N1, -}; - struct clk_div_mult_table { unsigned int *divisors; unsigned int nr_divisors; |