aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/clk
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-03-04 14:02:05 -0500
committerTero Kristo <t-kristo@ti.com>2015-06-02 05:31:45 -0400
commita3314e9cf69c1d4052017e559ea69a042ccd83e2 (patch)
treeac59f0bda8126dbc79b5ec0fb8edc9dca8c66fda /include/linux/clk
parentc9a58b0a848e4b88d2dd4690ef19bae8696649eb (diff)
clk: ti: move some public definitions to private header
Several exported TI clock driver features are no longer needed outside the clock driver itself, thus move all of these to the driver private header file. Also, update some of the driver files to actually include this header. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'include/linux/clk')
-rw-r--r--include/linux/clk/ti.h45
1 files changed, 0 insertions, 45 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 15f3c971ccab..5eccdf5c0e84 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -188,33 +188,6 @@ struct clk_hw_omap {
188/* DPLL Type and DCO Selection Flags */ 188/* DPLL Type and DCO Selection Flags */
189#define DPLL_J_TYPE 0x1 189#define DPLL_J_TYPE 0x1
190 190
191/* Composite clock component types */
192enum {
193 CLK_COMPONENT_TYPE_GATE = 0,
194 CLK_COMPONENT_TYPE_DIVIDER,
195 CLK_COMPONENT_TYPE_MUX,
196 CLK_COMPONENT_TYPE_MAX,
197};
198
199/**
200 * struct ti_dt_clk - OMAP DT clock alias declarations
201 * @lk: clock lookup definition
202 * @node_name: clock DT node to map to
203 */
204struct ti_dt_clk {
205 struct clk_lookup lk;
206 char *node_name;
207};
208
209#define DT_CLK(dev, con, name) \
210 { \
211 .lk = { \
212 .dev_id = dev, \
213 .con_id = con, \
214 }, \
215 .node_name = name, \
216 }
217
218/* Static memmap indices */ 191/* Static memmap indices */
219enum { 192enum {
220 TI_CLKM_CM = 0, 193 TI_CLKM_CM = 0,
@@ -225,8 +198,6 @@ enum {
225 CLK_MAX_MEMMAPS 198 CLK_MAX_MEMMAPS
226}; 199};
227 200
228typedef void (*ti_of_clk_init_cb_t)(struct clk_hw *, struct device_node *);
229
230/** 201/**
231 * struct clk_omap_reg - OMAP register declaration 202 * struct clk_omap_reg - OMAP register declaration
232 * @offset: offset from the master IP module base address 203 * @offset: offset from the master IP module base address
@@ -266,9 +237,6 @@ struct ti_clk_ll_ops {
266 237
267extern struct ti_clk_ll_ops *ti_clk_ll_ops; 238extern struct ti_clk_ll_ops *ti_clk_ll_ops;
268 239
269extern const struct clk_ops ti_clk_divider_ops;
270extern const struct clk_ops ti_clk_mux_ops;
271
272#define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw) 240#define to_clk_hw_omap(_hw) container_of(_hw, struct clk_hw_omap, hw)
273 241
274void omap2_init_clk_clkdm(struct clk_hw *clk); 242void omap2_init_clk_clkdm(struct clk_hw *clk);
@@ -276,14 +244,6 @@ int omap2_clk_disable_autoidle_all(void);
276int omap2_clk_enable_autoidle_all(void); 244int omap2_clk_enable_autoidle_all(void);
277int omap2_clk_allow_idle(struct clk *clk); 245int omap2_clk_allow_idle(struct clk *clk);
278int omap2_clk_deny_idle(struct clk *clk); 246int omap2_clk_deny_idle(struct clk *clk);
279void omap2_clkt_iclk_allow_idle(struct clk_hw_omap *clk);
280void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk);
281void omap2_clk_dflt_find_companion(struct clk_hw_omap *clk,
282 void __iomem **other_reg,
283 u8 *other_bit);
284void omap2_clk_dflt_find_idlest(struct clk_hw_omap *clk,
285 void __iomem **idlest_reg,
286 u8 *idlest_bit, u8 *idlest_val);
287unsigned long omap2_dpllcore_recalc(struct clk_hw *hw, 247unsigned long omap2_dpllcore_recalc(struct clk_hw *hw,
288 unsigned long parent_rate); 248 unsigned long parent_rate);
289int omap2_reprogram_dpllcore(struct clk_hw *clk, unsigned long rate, 249int omap2_reprogram_dpllcore(struct clk_hw *clk, unsigned long rate,
@@ -292,14 +252,9 @@ void omap2xxx_clkt_dpllcore_init(struct clk_hw *hw);
292void omap2xxx_clkt_vps_init(void); 252void omap2xxx_clkt_vps_init(void);
293unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk); 253unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk);
294 254
295void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index);
296void ti_dt_clocks_register(struct ti_dt_clk *oclks);
297void ti_dt_clk_init_provider(struct device_node *np, int index); 255void ti_dt_clk_init_provider(struct device_node *np, int index);
298void ti_dt_clk_init_retry_clks(void); 256void ti_dt_clk_init_retry_clks(void);
299void ti_dt_clockdomains_setup(void); 257void ti_dt_clockdomains_setup(void);
300int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw,
301 ti_of_clk_init_cb_t func);
302int ti_clk_add_component(struct device_node *node, struct clk_hw *hw, int type);
303 258
304int omap3430_dt_clk_init(void); 259int omap3430_dt_clk_init(void);
305int omap3630_dt_clk_init(void); 260int omap3630_dt_clk_init(void);