diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2012-04-27 16:55:59 +0530 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-12 19:18:51 -0700 |
| commit | d037e100d138fb522ed0ea3e3a915bd8e0e36f63 (patch) | |
| tree | 32a0dc720f4026dcba521b5b579933db59064cb0 /arch/arm/mach-omap2/clkt2xxx_sys.c | |
| parent | 455db9c9b23224f939723e9ded22b7a9a78fb57a (diff) | |
ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
Clean all #ifdef's added to OMAP2 clock code to make it COMMON clk
ready, not that CONFIG_COMMON_CLK is enabled.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: also drop CONFIG_COMMON_CLK tests around APLL recalc_rate
functions]
Signed-off-by: Mike Turquette <mturquette@ti.com>
[paul@pwsan.com: remove some ifdefs in mach-omap2/io.c]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clkt2xxx_sys.c')
| -rw-r--r-- | arch/arm/mach-omap2/clkt2xxx_sys.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_sys.c b/arch/arm/mach-omap2/clkt2xxx_sys.c index e6e73cf6aa95..f467d072cd02 100644 --- a/arch/arm/mach-omap2/clkt2xxx_sys.c +++ b/arch/arm/mach-omap2/clkt2xxx_sys.c @@ -40,16 +40,8 @@ u32 omap2xxx_get_sysclkdiv(void) return div; } -#ifdef CONFIG_COMMON_CLK unsigned long omap2xxx_sys_clk_recalc(struct clk_hw *clk, unsigned long parent_rate) { return parent_rate / omap2xxx_get_sysclkdiv(); } -#else -unsigned long omap2xxx_sys_clk_recalc(struct clk *clk) -{ - return clk->parent->rate / omap2xxx_get_sysclkdiv(); -} -#endif - |