diff options
| author | Paul Walmsley <paul@pwsan.com> | 2010-01-26 20:13:11 -0700 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-01-29 10:14:22 -0700 |
| commit | feec1277a5c599ebca6217bc6bb9f6410e84793b (patch) | |
| tree | cd095939bdd63b102b235857d434c1890aba8450 /arch/arm/mach-omap2/prcm.c | |
| parent | da4d2904abc0c31ac829e9c6d52106d5a6606507 (diff) | |
| download | kernel_samsung_smdk4412-feec1277a5c599ebca6217bc6bb9f6410e84793b.zip kernel_samsung_smdk4412-feec1277a5c599ebca6217bc6bb9f6410e84793b.tar.gz kernel_samsung_smdk4412-feec1277a5c599ebca6217bc6bb9f6410e84793b.tar.bz2 | |
OMAP2/3/4 clock: omap2_clk_prepare_for_reboot() is OMAP2xxx-only
omap2_clk_prepare_for_reboot() is only applicable to OMAP2xxx chips,
so rename it to omap2xxx_clk_prepare_for_reboot() and only call it when
running on OMAP2xxx chips. Remove the old stub in the OMAP3 clock code.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index abafd22..e8e121a 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -29,6 +29,7 @@ #include <plat/control.h> #include "clock.h" +#include "clock2xxx.h" #include "cm.h" #include "prm.h" #include "prm-regbits-24xx.h" @@ -133,11 +134,12 @@ EXPORT_SYMBOL(omap_prcm_get_reset_sources); void omap_prcm_arch_reset(char mode) { s16 prcm_offs; - omap2_clk_prepare_for_reboot(); - if (cpu_is_omap24xx()) + if (cpu_is_omap24xx()) { + omap2xxx_clk_prepare_for_reboot(); + prcm_offs = WKUP_MOD; - else if (cpu_is_omap34xx()) { + } else if (cpu_is_omap34xx()) { u32 l; prcm_offs = OMAP3430_GR_MOD; |