diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 13:53:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 13:53:43 -0400 |
commit | 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57 (patch) | |
tree | 2dea2ae498a6ce57de8890e87185aca5e9f3ad2d /include/asm-sh/clock.h | |
parent | 57b1494d2ba544c62673234da6115c21fac27ffc (diff) | |
parent | 7cb93181629c613ee2b8f4ffe3446f8003074842 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
mm/hugetlb.c must #include <asm/io.h>
video: Fix up hp6xx driver build regressions.
sh: defconfig updates.
sh: Kill off stray mach-rsk7203 reference.
serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
sh: Move out individual boards without mach groups.
sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
sh: Allow SH-3 and SH-5 to use common headers.
sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
sh/maple: clean maple bus code
sh: More header path fixups for mach dir refactoring.
sh: Move out the solution engine headers to arch/sh/include/mach-se/
sh: I2C fix for AP325RXA and Migo-R
sh: Shuffle the board directories in to mach groups.
sh: dma-sh: Fix up dreamcast dma.h mach path.
sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
sh: Add ARCH_DEFCONFIG entries for sh and sh64.
sh: Fix compile error of Solution Engine
sh: Proper __put_user_asm() size mismatch fix.
sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
...
Diffstat (limited to 'include/asm-sh/clock.h')
-rw-r--r-- | include/asm-sh/clock.h | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h deleted file mode 100644 index 720dfab7b15e..000000000000 --- a/include/asm-sh/clock.h +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | #ifndef __ASM_SH_CLOCK_H | ||
2 | #define __ASM_SH_CLOCK_H | ||
3 | |||
4 | #include <linux/kref.h> | ||
5 | #include <linux/list.h> | ||
6 | #include <linux/seq_file.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 | void (*enable)(struct clk *clk); | ||
15 | void (*disable)(struct clk *clk); | ||
16 | void (*recalc)(struct clk *clk); | ||
17 | int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id); | ||
18 | long (*round_rate)(struct clk *clk, unsigned long rate); | ||
19 | }; | ||
20 | |||
21 | struct clk { | ||
22 | struct list_head node; | ||
23 | const char *name; | ||
24 | int id; | ||
25 | struct module *owner; | ||
26 | |||
27 | struct clk *parent; | ||
28 | struct clk_ops *ops; | ||
29 | |||
30 | struct kref kref; | ||
31 | |||
32 | unsigned long rate; | ||
33 | unsigned long flags; | ||
34 | unsigned long arch_flags; | ||
35 | }; | ||
36 | |||
37 | #define CLK_ALWAYS_ENABLED (1 << 0) | ||
38 | #define CLK_RATE_PROPAGATES (1 << 1) | ||
39 | |||
40 | /* Should be defined by processor-specific code */ | ||
41 | void arch_init_clk_ops(struct clk_ops **, int type); | ||
42 | |||
43 | /* arch/sh/kernel/cpu/clock.c */ | ||
44 | int clk_init(void); | ||
45 | |||
46 | void clk_recalc_rate(struct clk *); | ||
47 | |||
48 | int clk_register(struct clk *); | ||
49 | void clk_unregister(struct clk *); | ||
50 | |||
51 | static inline int clk_always_enable(const char *id) | ||
52 | { | ||
53 | struct clk *clk; | ||
54 | int ret; | ||
55 | |||
56 | clk = clk_get(NULL, id); | ||
57 | if (IS_ERR(clk)) | ||
58 | return PTR_ERR(clk); | ||
59 | |||
60 | ret = clk_enable(clk); | ||
61 | if (ret) | ||
62 | clk_put(clk); | ||
63 | |||
64 | return ret; | ||
65 | } | ||
66 | |||
67 | /* the exported API, in addition to clk_set_rate */ | ||
68 | /** | ||
69 | * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter | ||
70 | * @clk: clock source | ||
71 | * @rate: desired clock rate in Hz | ||
72 | * @algo_id: algorithm id to be passed down to ops->set_rate | ||
73 | * | ||
74 | * Returns success (0) or negative errno. | ||
75 | */ | ||
76 | int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id); | ||
77 | |||
78 | enum clk_sh_algo_id { | ||
79 | NO_CHANGE = 0, | ||
80 | |||
81 | IUS_N1_N1, | ||
82 | IUS_322, | ||
83 | IUS_522, | ||
84 | IUS_N11, | ||
85 | |||
86 | SB_N1, | ||
87 | |||
88 | SB3_N1, | ||
89 | SB3_32, | ||
90 | SB3_43, | ||
91 | SB3_54, | ||
92 | |||
93 | BP_N1, | ||
94 | |||
95 | IP_N1, | ||
96 | }; | ||
97 | #endif /* __ASM_SH_CLOCK_H */ | ||