Skip to content

Commit

Permalink
ARM: mach-shmobile: sh7372 sleep warning fixes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Rafael J. Wysocki committed Sep 25, 2011
1 parent cf33835 commit a0089bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/arm/mach-shmobile/pm-sh7372.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-shmobile/sleep-sh7372.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -91,3 +92,4 @@ sh7372_do_idle_a3sm:

kernel_flush:
.word v7_flush_dcache_all
#endif

0 comments on commit a0089bd

Please sign in to comment.