Skip to contentSkip to conversation

ARM: mach-shmobile: sh7372 sleep warning fixes

PATCH New Magnus Damm 1 participant 1 message Sep 23, 2011

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 3/3 ARM: mach-shmobile: sh7372 sleep warning fixes

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

 arch/arm/mach-shmobile/pm-sh7372.c    |    5 ++++-
 arch/arm/mach-shmobile/sleep-sh7372.S |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/pm-sh7372.c +4 -1
@@ -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(vo
 	 /* 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 l
 	__raw_writel((irqcrx_high << 16) | irqcrx_low, IRQCR3);
 	__raw_writel((irqcry_high << 16) | irqcry_low, IRQCR4);
 }
-
+#endif
 
 #ifdef CONFIG_CPU_IDLE
arch/arm/mach-shmobile/sleep-sh7372.S +2 -0
@@ -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