---

yaml --- r: 267054 b: refs/heads/master c: a0089bd h: refs/heads/master v: v3
git-mirror · Sep 25, 2011 · b0bfb40 · b0bfb40
1 parent 8a8fd50
commit b0bfb40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf33835c5fc528cacd4f98bc38f246022dad340d
+refs/heads/master: a0089bd617adea27ebc352e1e0871649ab1dbaa6
diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/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/trunk/arch/arm/mach-shmobile/sleep-sh7372.S b/trunk/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