* [PATCH] ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
@ 2011-10-07 0:12 Tony Lindgren
2011-10-07 20:03 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Tony Lindgren @ 2011-10-07 0:12 UTC (permalink / raw)
To: linux-arm-kernel
Fix "Enable 32kHz OS timer in order to allow sleep states in idle"
warning. We are now compiling in bothe MPU timer and 32 KiHz timer,
so this warning is only valid when CONFIG_OMAP_32K_TIMER is not set.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 495b398..6badc29 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -116,7 +116,7 @@ void omap1_pm_idle(void)
return;
}
-#ifdef CONFIG_OMAP_MPU_TIMER
+#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_32K_TIMER)
#warning Enable 32kHz OS timer in order to allow sleep states in idle
use_idlect1 = use_idlect1 & ~(1 << 9);
#else
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
2011-10-07 0:12 [PATCH] ARM: OMAP1: Fix warnings about enabling 32 KiHz timer Tony Lindgren
@ 2011-10-07 20:03 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2011-10-07 20:03 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [111006 16:38]:
> Fix "Enable 32kHz OS timer in order to allow sleep states in idle"
> warning. We are now compiling in bothe MPU timer and 32 KiHz timer,
> so this warning is only valid when CONFIG_OMAP_32K_TIMER is not set.
>
> -#ifdef CONFIG_OMAP_MPU_TIMER
> +#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_32K_TIMER)
> #warning Enable 32kHz OS timer in order to allow sleep states in idle
> use_idlect1 = use_idlect1 & ~(1 << 9);
> #else
This should be !defined(CONFIG_OMAP_DM_TIMER) instead of CONFIG_OMAP_32K
timer. Corrected patch below.
Tony
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 6 Oct 2011 17:05:51 -0700
Subject: [PATCH] ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
Fix "Enable 32kHz OS timer in order to allow sleep states in idle"
warning. We are now compiling in bothe MPU timer and 32 KiHz timer,
so this warning is only valid when MPU_TIMER is set and OMAP_DM_TIMER
is not set.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 495b398..89ea20c 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -116,7 +116,7 @@ void omap1_pm_idle(void)
return;
}
-#ifdef CONFIG_OMAP_MPU_TIMER
+#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_DM_TIMER)
#warning Enable 32kHz OS timer in order to allow sleep states in idle
use_idlect1 = use_idlect1 & ~(1 << 9);
#else
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-07 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-07 0:12 [PATCH] ARM: OMAP1: Fix warnings about enabling 32 KiHz timer Tony Lindgren
2011-10-07 20:03 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).