1 files changed, 3 insertions, 158 deletions
diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h
index 11da4c5beb68..803d4c7f09dc 100644
--- a/arch/sh/include/asm/clock.h
+++ b/arch/sh/include/asm/clock.h
@@ -1,171 +1,16 @@
 #ifndef __ASM_SH_CLOCK_H
 #define __ASM_SH_CLOCK_H
-#include <linux/list.h>
+#include <linux/sh_clk.h>
-#include <linux/seq_file.h>
-#include <linux/cpufreq.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-struct clk;
-struct clk_ops {
-        void (*init)(struct clk *clk);
-        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_parent)(struct clk *clk, struct clk *parent);
-        long (*round_rate)(struct clk *clk, unsigned long rate);
-};
-struct clk {
-        struct list_head        node;
-        const char              *name;
-        int                     id;
-        struct module           *owner;
-        struct clk              *parent;
-        struct clk_ops          *ops;
-        struct list_head        children;
-        struct list_head        sibling;        /* node for children */
-        int                     usecount;
-        unsigned long           rate;
-        unsigned long           flags;
-        void __iomem            *enable_reg;
-        unsigned int            enable_bit;
-        unsigned long           arch_flags;
-        void                    *priv;
-        struct dentry           *dentry;
-        struct cpufreq_frequency_table *freq_table;
-};
-struct clk_lookup {
-        struct list_head        node;
-        const char              *dev_id;
-        const char              *con_id;
-        struct clk              *clk;
-};
-#define CLK_ENABLE_ON_INIT      (1 << 0)
 /* Should be defined by processor-specific code */
 void __deprecated arch_init_clk_ops(struct clk_ops **, int type);
 int __init arch_clk_init(void);
-/* arch/sh/kernel/cpu/clock.c */
-int clk_init(void);
-unsigned long followparent_recalc(struct clk *);
-void recalculate_root_clocks(void);
-void propagate_rate(struct clk *);
-int clk_reparent(struct clk *child, struct clk *parent);
-int clk_register(struct clk *);
-void clk_unregister(struct clk *);
 /* arch/sh/kernel/cpu/clock-cpg.c */
 int __init __deprecated cpg_clk_init(void);
-/* the exported API, in addition to clk_set_rate */
+/* arch/sh/kernel/cpu/clock.c */
-/**
+int clk_init(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;
-        unsigned int *multipliers;
-        unsigned int nr_multipliers;
-};
-struct cpufreq_frequency_table;
-void clk_rate_table_build(struct clk *clk,
-                          struct cpufreq_frequency_table *freq_table,
-                          int nr_freqs,
-                          struct clk_div_mult_table *src_table,
-                          unsigned long *bitmap);
-long clk_rate_table_round(struct clk *clk,
-                          struct cpufreq_frequency_table *freq_table,
-                          unsigned long rate);
-int clk_rate_table_find(struct clk *clk,
-                        struct cpufreq_frequency_table *freq_table,
-                        unsigned long rate);
-#define SH_CLK_MSTP32(_name, _id, _parent, _enable_reg, \
-            _enable_bit, _flags)                        \
-{                                                       \
-        .name           = _name,                        \
-        .id             = _id,                          \
-        .parent         = _parent,                      \
-        .enable_reg     = (void __iomem *)_enable_reg,  \
-        .enable_bit     = _enable_bit,                  \
-        .flags          = _flags,                       \
-}
-int sh_clk_mstp32_register(struct clk *clks, int nr);
-#define SH_CLK_DIV4(_name, _parent, _reg, _shift, _div_bitmap, _flags)  \
-{                                                                       \
-        .name = _name,                                                  \
-        .parent = _parent,                                              \
-        .enable_reg = (void __iomem *)_reg,                             \
-        .enable_bit = _shift,                                           \
-        .arch_flags = _div_bitmap,                                      \
-        .flags = _flags,                                                \
-}
-struct clk_div4_table {
-        struct clk_div_mult_table *div_mult_table;
-        void (*kick)(struct clk *clk);
-};
-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,
-                         struct clk_div4_table *table);
-int sh_clk_div4_reparent_register(struct clk *clks, int nr,
-                         struct clk_div4_table *table);
-#define SH_CLK_DIV6(_name, _parent, _reg, _flags)       \
-{                                                       \
-        .name = _name,                                  \
-        .parent = _parent,                              \
-        .enable_reg = (void __iomem *)_reg,             \
-        .flags = _flags,                                \
-}
-int sh_clk_div6_register(struct clk *clks, int nr);
 #endif /* __ASM_SH_CLOCK_H */

diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h index 11da4c5beb68..803d4c7f09dc 100644 --- a/arch/sh/include/asm/clock.h +++ b/arch/sh/include/asm/clock.h
@@ -1,171 +1,16 @@
1	#ifndef __ASM_SH_CLOCK_H	1	#ifndef __ASM_SH_CLOCK_H
2	#define __ASM_SH_CLOCK_H	2	#define __ASM_SH_CLOCK_H
3		3
4	#include <linux/list.h>	4	#include <linux/sh_clk.h>
5	#include <linux/seq_file.h>
6	#include <linux/cpufreq.h>
7	#include <linux/clk.h>
8	#include <linux/err.h>
9
10	struct clk;
11
12	struct clk_ops {
13	void (init)(struct clk clk);
14	int (enable)(struct clk clk);
15	void (disable)(struct clk clk);
16	unsigned long (recalc)(struct clk clk);
17	int (set_rate)(struct clk clk, unsigned long rate, int algo_id);
18	int (set_parent)(struct clk clk, struct clk *parent);
19	long (round_rate)(struct clk clk, unsigned long rate);
20	};
21
22	struct clk {
23	struct list_head node;
24	const char *name;
25	int id;
26	struct module *owner;
27
28	struct clk *parent;
29	struct clk_ops *ops;
30
31	struct list_head children;
32	struct list_head sibling; /* node for children */
33
34	int usecount;
35
36	unsigned long rate;
37	unsigned long flags;
38
39	void __iomem *enable_reg;
40	unsigned int enable_bit;
41
42	unsigned long arch_flags;
43	void *priv;
44	struct dentry *dentry;
45	struct cpufreq_frequency_table *freq_table;
46	};
47
48	struct clk_lookup {
49	struct list_head node;
50	const char *dev_id;
51	const char *con_id;
52	struct clk *clk;
53	};
54
55	#define CLK_ENABLE_ON_INIT (1 << 0)
56		5
57	/* Should be defined by processor-specific code */	6	/* Should be defined by processor-specific code */
58	void __deprecated arch_init_clk_ops(struct clk_ops **, int type);	7	void __deprecated arch_init_clk_ops(struct clk_ops **, int type);
59	int __init arch_clk_init(void);	8	int __init arch_clk_init(void);
60		9
61	/* arch/sh/kernel/cpu/clock.c */
62	int clk_init(void);
63	unsigned long followparent_recalc(struct clk *);
64	void recalculate_root_clocks(void);
65	void propagate_rate(struct clk *);
66	int clk_reparent(struct clk child, struct clk parent);
67	int clk_register(struct clk *);
68	void clk_unregister(struct clk *);
69
70	/* arch/sh/kernel/cpu/clock-cpg.c */	10	/* arch/sh/kernel/cpu/clock-cpg.c */
71	int __init __deprecated cpg_clk_init(void);	11	int __init __deprecated cpg_clk_init(void);
72		12
73	/* the exported API, in addition to clk_set_rate */	13	/* arch/sh/kernel/cpu/clock.c */
74	/**	14	int clk_init(void);
75	* clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
76	* @clk: clock source
77	* @rate: desired clock rate in Hz
78	* @algo_id: algorithm id to be passed down to ops->set_rate
79	*
80	* Returns success (0) or negative errno.
81	*/
82	int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id);
83
84	enum clk_sh_algo_id {
85	NO_CHANGE = 0,
86
87	IUS_N1_N1,
88	IUS_322,
89	IUS_522,
90	IUS_N11,
91
92	SB_N1,
93
94	SB3_N1,
95	SB3_32,
96	SB3_43,
97	SB3_54,
98
99	BP_N1,
100
101	IP_N1,
102	};
103
104	struct clk_div_mult_table {
105	unsigned int *divisors;
106	unsigned int nr_divisors;
107	unsigned int *multipliers;
108	unsigned int nr_multipliers;
109	};
110
111	struct cpufreq_frequency_table;
112	void clk_rate_table_build(struct clk *clk,
113	struct cpufreq_frequency_table *freq_table,
114	int nr_freqs,
115	struct clk_div_mult_table *src_table,
116	unsigned long *bitmap);
117
118	long clk_rate_table_round(struct clk *clk,
119	struct cpufreq_frequency_table *freq_table,
120	unsigned long rate);
121
122	int clk_rate_table_find(struct clk *clk,
123	struct cpufreq_frequency_table *freq_table,
124	unsigned long rate);
125
126	#define SH_CLK_MSTP32(_name, _id, _parent, _enable_reg, \
127	_enable_bit, _flags) \
128	{ \
129	.name = _name, \
130	.id = _id, \
131	.parent = _parent, \
132	.enable_reg = (void __iomem *)_enable_reg, \
133	.enable_bit = _enable_bit, \
134	.flags = _flags, \
135	}
136
137	int sh_clk_mstp32_register(struct clk *clks, int nr);
138
139	#define SH_CLK_DIV4(_name, _parent, _reg, _shift, _div_bitmap, _flags) \
140	{ \
141	.name = _name, \
142	.parent = _parent, \
143	.enable_reg = (void __iomem *)_reg, \
144	.enable_bit = _shift, \
145	.arch_flags = _div_bitmap, \
146	.flags = _flags, \
147	}
148
149	struct clk_div4_table {
150	struct clk_div_mult_table *div_mult_table;
151	void (kick)(struct clk clk);
152	};
153
154	int sh_clk_div4_register(struct clk *clks, int nr,
155	struct clk_div4_table *table);
156	int sh_clk_div4_enable_register(struct clk *clks, int nr,
157	struct clk_div4_table *table);
158	int sh_clk_div4_reparent_register(struct clk *clks, int nr,
159	struct clk_div4_table *table);
160
161	#define SH_CLK_DIV6(_name, _parent, _reg, _flags) \
162	{ \
163	.name = _name, \
164	.parent = _parent, \
165	.enable_reg = (void __iomem *)_reg, \
166	.flags = _flags, \
167	}
168
169	int sh_clk_div6_register(struct clk *clks, int nr);
170		15
171	#endif /* __ASM_SH_CLOCK_H */	16	#endif /* __ASM_SH_CLOCK_H */