Commit 8b5ee113 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d28bdf05
...@@ -10,4 +10,7 @@ int __init arch_clk_init(void); ...@@ -10,4 +10,7 @@ int __init arch_clk_init(void);
/* arch/sh/kernel/cpu/clock-cpg.c */ /* arch/sh/kernel/cpu/clock-cpg.c */
int __init __deprecated cpg_clk_init(void); int __init __deprecated cpg_clk_init(void);
/* arch/sh/kernel/cpu/clock.c */
int clk_init(void);
#endif /* __ASM_SH_CLOCK_H */ #endif /* __ASM_SH_CLOCK_H */
This diff is collapsed.
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
obj-$(CONFIG_SUPERHYWAY) += superhyway/ obj-$(CONFIG_SUPERHYWAY) += superhyway/
obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_MAPLE) += maple/
obj-$(CONFIG_GENERIC_GPIO) += pfc.o obj-$(CONFIG_GENERIC_GPIO) += pfc.o
obj-$(CONFIG_SUPERH) += clk.o
obj-y += intc.o obj-y += intc.o
This diff is collapsed.
...@@ -47,13 +47,13 @@ struct clk { ...@@ -47,13 +47,13 @@ struct clk {
#define CLK_ENABLE_ON_INIT (1 << 0) #define CLK_ENABLE_ON_INIT (1 << 0)
/* arch/sh/kernel/cpu/clock.c */ /* arch/sh/kernel/cpu/clock.c */
int clk_init(void);
unsigned long followparent_recalc(struct clk *); unsigned long followparent_recalc(struct clk *);
void recalculate_root_clocks(void); void recalculate_root_clocks(void);
void propagate_rate(struct clk *); void propagate_rate(struct clk *);
int clk_reparent(struct clk *child, struct clk *parent); int clk_reparent(struct clk *child, struct clk *parent);
int clk_register(struct clk *); int clk_register(struct clk *);
void clk_unregister(struct clk *); void clk_unregister(struct clk *);
void clk_enable_init_clocks(void);
/* the exported API, in addition to clk_set_rate */ /* the exported API, in addition to clk_set_rate */
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment