Skip to contentSkip to conversation

ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

PATCH New Tony Lindgren 1 participant 2 messages Oct 7, 2011

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP1 support OMAP power management support
lore
Share & tools
lore

Tony Lindgren

author reviewer
#0 lore raw

PATCH 1/1 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 CONFIG_OMAP_32K_TIMER is not set.

Signed-off-by Tony Lindgren <[email protected]>
arch/arm/mach-omap1/pm.c +1 -1
index 495b398..6badc29 100644
@@ -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
author reviewer
#1 lore raw

PATCH 1/1 ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

Review

Quoted 9 lines · Tony Lindgren

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.

(quoted diff) +1 -1
-#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 <[email protected]>
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 <[email protected]>
arch/arm/mach-omap1/pm.c +1 -1
index 495b398..89ea20c 100644
@@ -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