Commit a0089bd6 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki

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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent cf33835c
...@@ -189,6 +189,7 @@ struct sh7372_pm_domain sh7372_a3sg = { ...@@ -189,6 +189,7 @@ struct sh7372_pm_domain sh7372_a3sg = {
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)
static int sh7372_do_idle_core_standby(unsigned long unused) static int sh7372_do_idle_core_standby(unsigned long unused)
{ {
cpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */ cpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */
...@@ -209,7 +210,9 @@ static void sh7372_enter_core_standby(void) ...@@ -209,7 +210,9 @@ static void sh7372_enter_core_standby(void)
/* disable reset vector translation */ /* disable reset vector translation */
__raw_writel(0, SBAR); __raw_writel(0, SBAR);
} }
#endif
#ifdef CONFIG_SUSPEND
static void sh7372_enter_a3sm_common(int pllc0_on) static void sh7372_enter_a3sm_common(int pllc0_on)
{ {
/* set reset vector, translate 4k */ /* set reset vector, translate 4k */
...@@ -351,7 +354,7 @@ static void sh7372_setup_a3sm(unsigned long msk, unsigned long msk2) ...@@ -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((irqcrx_high << 16) | irqcrx_low, IRQCR3);
__raw_writel((irqcry_high << 16) | irqcry_low, IRQCR4); __raw_writel((irqcry_high << 16) | irqcry_low, IRQCR4);
} }
#endif
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)
.align 12 .align 12
.text .text
.global sh7372_resume_core_standby_a3sm .global sh7372_resume_core_standby_a3sm
...@@ -91,3 +92,4 @@ sh7372_do_idle_a3sm: ...@@ -91,3 +92,4 @@ sh7372_do_idle_a3sm:
kernel_flush: kernel_flush:
.word v7_flush_dcache_all .word v7_flush_dcache_all
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment