diff options
author | Rajendra Nayak <rnayak@ti.com> | 2012-04-27 07:05:52 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-11-12 21:18:50 -0500 |
commit | 25f4214e388dda818765b670fb608f2e6467d877 (patch) | |
tree | 7d93133ad7ab52df724461bc903a9d49aba08ddf /arch/arm/mach-omap2/clock3xxx.c | |
parent | 13a5b6228679456cbc47a8d50e6580063caf8058 (diff) |
ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts
Clean all #ifdef's added to OMAP3 clock code to make it COMMON clk
ready, not that CONFIG_COMMON_CLK is enabled.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
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/clock3xxx.c')
-rw-r--r-- | arch/arm/mach-omap2/clock3xxx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx.c b/arch/arm/mach-omap2/clock3xxx.c index a6f75cd85327..4eacab8f1176 100644 --- a/arch/arm/mach-omap2/clock3xxx.c +++ b/arch/arm/mach-omap2/clock3xxx.c | |||
@@ -38,12 +38,8 @@ | |||
38 | 38 | ||
39 | /* needed by omap3_core_dpll_m2_set_rate() */ | 39 | /* needed by omap3_core_dpll_m2_set_rate() */ |
40 | struct clk *sdrc_ick_p, *arm_fck_p; | 40 | struct clk *sdrc_ick_p, *arm_fck_p; |
41 | #ifdef CONFIG_COMMON_CLK | ||
42 | int omap3_dpll4_set_rate(struct clk_hw *hw, unsigned long rate, | 41 | int omap3_dpll4_set_rate(struct clk_hw *hw, unsigned long rate, |
43 | unsigned long parent_rate) | 42 | unsigned long parent_rate) |
44 | #else | ||
45 | int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) | ||
46 | #endif | ||
47 | { | 43 | { |
48 | /* | 44 | /* |
49 | * According to the 12-5 CDP code from TI, "Limitation 2.5" | 45 | * According to the 12-5 CDP code from TI, "Limitation 2.5" |
@@ -55,11 +51,7 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) | |||
55 | return -EINVAL; | 51 | return -EINVAL; |
56 | } | 52 | } |
57 | 53 | ||
58 | #ifdef CONFIG_COMMON_CLK | ||
59 | return omap3_noncore_dpll_set_rate(hw, rate, parent_rate); | 54 | return omap3_noncore_dpll_set_rate(hw, rate, parent_rate); |
60 | #else | ||
61 | return omap3_noncore_dpll_set_rate(clk, rate); | ||
62 | #endif | ||
63 | } | 55 | } |
64 | 56 | ||
65 | void __init omap3_clk_lock_dpll5(void) | 57 | void __init omap3_clk_lock_dpll5(void) |