aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:46 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:26:55 -0500
commit56213ca4e440c0b6e56a48f5901c55c4ce3cf1ba (patch)
tree7047bf0972fc65e7f32b873a9919398660ef12c3 /arch/arm/mach-omap2/clock.h
parent9556175183ddf19e9a7afa449c259a0a5081fa29 (diff)
omap2/3: Multiboot compile fixes to compile in omap2 and omap3
Allows compiling in omap2 and omap3. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock.h')
-rw-r--r--arch/arm/mach-omap2/clock.h26
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 7bc344bcbb47..a6e85f46a65c 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -83,6 +83,32 @@ int omap2_clksel_set_parent(struct clk *clk, struct clk *new_parent);
83u32 omap2_get_dpll_rate(struct clk *clk); 83u32 omap2_get_dpll_rate(struct clk *clk);
84void omap2_init_dpll_parent(struct clk *clk); 84void omap2_init_dpll_parent(struct clk *clk);
85int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name); 85int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name);
86
87
88#ifdef CONFIG_ARCH_OMAP2
89void omap2xxx_clk_prepare_for_reboot(void);
90#else
91static inline void omap2xxx_clk_prepare_for_reboot(void)
92{
93}
94#endif
95
96#ifdef CONFIG_ARCH_OMAP3
97void omap3_clk_prepare_for_reboot(void);
98#else
99static inline void omap3_clk_prepare_for_reboot(void)
100{
101}
102#endif
103
104#ifdef CONFIG_ARCH_OMAP4
105void omap4_clk_prepare_for_reboot(void);
106#else
107static inline void omap4_clk_prepare_for_reboot(void)
108{
109}
110#endif
111
86int omap2_dflt_clk_enable(struct clk *clk); 112int omap2_dflt_clk_enable(struct clk *clk);
87void omap2_dflt_clk_disable(struct clk *clk); 113void omap2_dflt_clk_disable(struct clk *clk);
88void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg, 114void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg,