diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-05 04:36:34 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-05 04:36:34 +0400 |
commit | 8f86f36284547fdd873769a5f190549f3ab69cca (patch) | |
tree | 06791d877fec7a0b3a6059b14ebad9e5ed77b200 /arch/arm/mach-omap2/clock.h | |
parent | 994c0e992522c123298b4a91b72f5e67ba2d1123 (diff) | |
parent | 1194d7b82486ad967db65115559e9ad50a88ba57 (diff) | |
download | linux-8f86f36284547fdd873769a5f190549f3ab69cca.tar.xz |
Merge branch 'omap_clock_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-omap2/clock.h')
-rw-r--r-- | arch/arm/mach-omap2/clock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 48ac568881bd..2311bc217226 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h @@ -66,6 +66,8 @@ void omap3_noncore_dpll_disable(struct clk *clk); int omap4_dpllmx_gatectrl_read(struct clk *clk); void omap4_dpllmx_allow_gatectrl(struct clk *clk); void omap4_dpllmx_deny_gatectrl(struct clk *clk); +long omap4_dpll_regm4xen_round_rate(struct clk *clk, unsigned long target_rate); +unsigned long omap4_dpll_regm4xen_recalc(struct clk *clk); #ifdef CONFIG_OMAP_RESET_CLOCKS void omap2_clk_disable_unused(struct clk *clk); |