diff options
| author | Magnus Damm | 2011-09-25 23:21:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2011-09-25 23:21:02 +0200 |
| commit | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (patch) | |
| tree | 0719ce3601acf6bdd55267d02039f79c971739df | |
| parent | ARM: mach-shmobile: sh7372 A3SM support (diff) | |
| download | kernel-qcow2-linux-a0089bd617adea27ebc352e1e0871649ab1dbaa6.tar.gz kernel-qcow2-linux-a0089bd617adea27ebc352e1e0871649ab1dbaa6.tar.xz kernel-qcow2-linux-a0089bd617adea27ebc352e1e0871649ab1dbaa6.zip | |
ARM: mach-shmobile: sh7372 sleep warning fixes
Update the sh7372 sleep code to build parts of the
code only when SUSPEND and/or CPU_IDLE are set.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/sleep-sh7372.S | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 444f42fe1359..8e0944f96ba1 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -189,6 +189,7 @@ struct sh7372_pm_domain sh7372_a3sg = { #endif /* CONFIG_PM */ +#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE) static int sh7372_do_idle_core_standby(unsigned long unused) { cpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */ @@ -209,7 +210,9 @@ static void sh7372_enter_core_standby(void) /* disable reset vector translation */ __raw_writel(0, SBAR); } +#endif +#ifdef CONFIG_SUSPEND static void sh7372_enter_a3sm_common(int pllc0_on) { /* set reset vector, translate 4k */ @@ -351,7 +354,7 @@ static void sh7372_setup_a3sm(unsigned long msk, unsigned long msk2) __raw_writel((irqcrx_high << 16) | irqcrx_low, IRQCR3); __raw_writel((irqcry_high << 16) | irqcry_low, IRQCR4); } - +#endif #ifdef CONFIG_CPU_IDLE diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S index d365842ded47..f3ab3c5810ea 100644 --- a/arch/arm/mach-shmobile/sleep-sh7372.S +++ b/arch/arm/mach-shmobile/sleep-sh7372.S @@ -34,6 +34,7 @@ #include <asm/memory.h> #include <asm/assembler.h> +#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE) .align 12 .text .global sh7372_resume_core_standby_a3sm @@ -91,3 +92,4 @@ sh7372_do_idle_a3sm: kernel_flush: .word v7_flush_dcache_all +#endif |