diff options
author | Magnus Damm <damm@opensource.se> | 2010-05-11 09:29:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:39:14 -0400 |
commit | 8b5ee113e1b97097e992a0301d0cac2530b31fc2 (patch) | |
tree | a51016a7cd0cc138354fd221040c883da8731d54 /include/linux/sh_clk.h | |
parent | d28bdf05f72238d626c8d06b61049f6df8d78e70 (diff) |
sh: move sh clock.c contents to drivers/sh/clk.
This patch is V2 of the SH clock framework move from
arch/sh/kernel/cpu/clock.c to drivers/sh/clk.c. All
code except the following functions are moved:
clk_init(), clk_get() and clk_put().
The init function is still kept in clock.c since it
depends on the SH-specific machvec implementation.
The symbols clk_get() and clk_put() already exist in
the common ARM clkdev code, those symbols are left in
the SH tree to avoid duplicating them for SH-Mobile ARM.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/sh_clk.h')
-rw-r--r-- | include/linux/sh_clk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index de911451c216..6d7de242be1d 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -47,13 +47,13 @@ struct clk { | |||
47 | #define CLK_ENABLE_ON_INIT (1 << 0) | 47 | #define CLK_ENABLE_ON_INIT (1 << 0) |
48 | 48 | ||
49 | /* arch/sh/kernel/cpu/clock.c */ | 49 | /* arch/sh/kernel/cpu/clock.c */ |
50 | int clk_init(void); | ||
51 | unsigned long followparent_recalc(struct clk *); | 50 | unsigned long followparent_recalc(struct clk *); |
52 | void recalculate_root_clocks(void); | 51 | void recalculate_root_clocks(void); |
53 | void propagate_rate(struct clk *); | 52 | void propagate_rate(struct clk *); |
54 | int clk_reparent(struct clk *child, struct clk *parent); | 53 | int clk_reparent(struct clk *child, struct clk *parent); |
55 | int clk_register(struct clk *); | 54 | int clk_register(struct clk *); |
56 | void clk_unregister(struct clk *); | 55 | void clk_unregister(struct clk *); |
56 | void clk_enable_init_clocks(void); | ||
57 | 57 | ||
58 | /* the exported API, in addition to clk_set_rate */ | 58 | /* the exported API, in addition to clk_set_rate */ |
59 | /** | 59 | /** |