Skip to contentSkip to conversation

ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

PATCH New Igor Grinberg 3 participants 5 messages Aug 27, 2012 – Aug 30, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Igor Grinberg

author
#0 lore raw

PATCH 1/1 ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

Currently, omap2_sync32k_clocksource_init() function initializes the 32K timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER setting.
Fix this by providing a default implementation for !CONFIG_OMAP_32K_TIMER case.

Signed-off-by Igor Grinberg <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/timer.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/timer.c +7 -0
index 840929b..2cdbcc7 100644
@@ -263,6 +263,7 @@ static u32 notrace dmtimer_read_sched_clock(void)
 	return 0;
 }
 
+#ifdef CONFIG_OMAP_32K_TIMER
 /* Setup free-running counter for clocksource */
 static int __init omap2_sync32k_clocksource_init(void)
 {

@@ -302,6 +303,12 @@ static int __init omap2_sync32k_clocksource_init(void)
 
 	return ret;
 }
+#else
+static inline int omap2_sync32k_clocksource_init(void)
+{
+	return -ENODEV;
+}
+#endif
 
 static void __init omap2_gptimer_clocksource_init(int gptimer_id,
 						const char *fck_source)
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

Quoted 9 lines · Igor Grinberg

Currently, omap2_sync32k_clocksource_init() function initializes the 32K timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER setting.
Fix this by providing a default implementation for !CONFIG_OMAP_32K_TIMER case.

Signed-off-by Igor Grinberg <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

---

Acked-by Santosh Shilimkar <[email protected]>
author
#2 lore raw

PATCH 1/1 ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

Quoted 11 lines · Santosh
Quoted 9 lines · Igor Grinberg

Currently, omap2_sync32k_clocksource_init() function initializes the 32K timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER setting.
Fix this by providing a default implementation for !CONFIG_OMAP_32K_TIMER case.

Signed-off-by Igor Grinberg <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

---

Acked-by Santosh Shilimkar <[email protected]>

Thanks Santosh!

Tony, apparently, this bug has been there for a while, so probably I should have added:
Cc: stable at vger.kernel.org

Thanks!

Signature · 2 lines
Regards,
Igor.
maintainer
#3 lore raw

PATCH 1/1 ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

Quoted 11 lines · Igor Grinberg
Quoted 10 lines · Santosh
Quoted 9 lines · Igor Grinberg

Currently, omap2_sync32k_clocksource_init() function initializes the 32K timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER setting.
Fix this by providing a default implementation for !CONFIG_OMAP_32K_TIMER case.

Signed-off-by Igor Grinberg <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

---

Quoted 7 lines
Quoted 1 line
Acked-by Santosh Shilimkar <[email protected]>

Thanks Santosh!

Tony, apparently, this bug has been there for a while, so probably I should have added:
Cc: stable at vger.kernel.org

Thanks I'll apply this into fixes with Cc: stable. Note that
Cc: stable is usually added at commit time, or at least you're not supposed to send the patch for review there.

Regards,

Tony

author
#4 lore raw

PATCH 1/1 ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

Quoted 16 lines · Tony Lindgren
Quoted 15 lines · Igor Grinberg
Quoted 11 lines · Santosh
Quoted 9 lines · Igor Grinberg

Currently, omap2_sync32k_clocksource_init() function initializes the 32K timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER setting.
Fix this by providing a default implementation for !CONFIG_OMAP_32K_TIMER case.

Signed-off-by Igor Grinberg <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

---

Acked-by Santosh Shilimkar <[email protected]>

Thanks Santosh!

Quoted 7 lines
Quoted 3 lines

Tony, apparently, this bug has been there for a while, so probably I should have added:
Cc: stable at vger.kernel.org

Thanks I'll apply this into fixes with Cc: stable. Note that
Cc: stable is usually added at commit time, or at least you're not supposed to send the patch for review there.

Yeah yeah, I know, I just forgot to add it while committing.

Thanks!

Signature · 2 lines
Regards,
Igor.