aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/clk
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-03-02 12:06:54 -0500
committerTero Kristo <t-kristo@ti.com>2015-06-02 05:31:13 -0400
commitbf22bae794d696e411acfcac39b415e160e93834 (patch)
tree73614c7bd3659b8edaaf841cfb8f2e2c545b5795 /include/linux/clk
parent5100349b95bf238c6c83cb702a64a56a6ee58fc9 (diff)
clk: ti: autoidle: move generic autoidle handling code to clock driver
This is no longer needed in platform directory, as the legacy clock data is gone, so move it under TI clock driver. Some static functions are renamed also. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'include/linux/clk')
-rw-r--r--include/linux/clk/ti.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 79e143dfc793..320e107f9a7a 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -259,7 +259,6 @@ extern const struct clk_ops ti_clk_mux_ops;
259 259
260#define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw) 260#define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw)
261 261
262void omap2_init_clk_hw_omap_clocks(struct clk *clk);
263int omap3_noncore_dpll_enable(struct clk_hw *hw); 262int omap3_noncore_dpll_enable(struct clk_hw *hw);
264void omap3_noncore_dpll_disable(struct clk_hw *hw); 263void omap3_noncore_dpll_disable(struct clk_hw *hw);
265int omap3_noncore_dpll_set_parent(struct clk_hw *hw, u8 index); 264int omap3_noncore_dpll_set_parent(struct clk_hw *hw, u8 index);
@@ -288,6 +287,9 @@ long omap3_clkoutx2_round_rate(struct clk_hw *hw, unsigned long rate,
288int omap2_clkops_enable_clkdm(struct clk_hw *hw); 287int omap2_clkops_enable_clkdm(struct clk_hw *hw);
289void omap2_clkops_disable_clkdm(struct clk_hw *hw); 288void omap2_clkops_disable_clkdm(struct clk_hw *hw);
290int omap2_clk_disable_autoidle_all(void); 289int omap2_clk_disable_autoidle_all(void);
290int omap2_clk_enable_autoidle_all(void);
291int omap2_clk_allow_idle(struct clk *clk);
292int omap2_clk_deny_idle(struct clk *clk);
291void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks); 293void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks);
292int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate, 294int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate,
293 unsigned long parent_rate); 295 unsigned long parent_rate);
@@ -320,7 +322,6 @@ void ti_dt_clk_init_retry_clks(void);
320void ti_dt_clockdomains_setup(void); 322void ti_dt_clockdomains_setup(void);
321int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, 323int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw,
322 ti_of_clk_init_cb_t func); 324 ti_of_clk_init_cb_t func);
323int of_ti_clk_autoidle_setup(struct device_node *node);
324int ti_clk_add_component(struct device_node *node, struct clk_hw *hw, int type); 325int ti_clk_add_component(struct device_node *node, struct clk_hw *hw, int type);
325 326
326int omap3430_dt_clk_init(void); 327int omap3430_dt_clk_init(void);
@@ -351,14 +352,6 @@ struct ti_clk_features {
351void ti_clk_setup_features(struct ti_clk_features *features); 352void ti_clk_setup_features(struct ti_clk_features *features);
352const struct ti_clk_features *ti_clk_get_features(void); 353const struct ti_clk_features *ti_clk_get_features(void);
353 354
354#ifdef CONFIG_OF
355void of_ti_clk_allow_autoidle_all(void);
356void of_ti_clk_deny_autoidle_all(void);
357#else
358static inline void of_ti_clk_allow_autoidle_all(void) { }
359static inline void of_ti_clk_deny_autoidle_all(void) { }
360#endif
361
362extern const struct clk_hw_omap_ops clkhwops_omap2xxx_dpll; 355extern const struct clk_hw_omap_ops clkhwops_omap2xxx_dpll;
363extern const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait; 356extern const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait;
364extern const struct clk_hw_omap_ops clkhwops_omap3_dpll; 357extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;