When CONFIG_OMAP_RESET_CLOCKS=y is enabled on OMAP3, the 32k sync clock is disabled, resulting in a crash when any access to it is done, including a sched_clock().

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/plat-omap/common.c |    6 ++++++
 1 file changed, 6 insertions(+)

arch/arm/plat-omap/common.c +6 -0

Index: dev/arch/arm/plat-omap/common.c
===================================================================
@@ -236,6 +236,12 @@ static int __init omap_init_clocksource_
 			"%s: can't register clocksource!\n";
 
 	if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
+		struct clk *sync_32k_ick;
+
+		sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
+		if (sync_32k_ick)
+			clk_enable(sync_32k_ick);
+
 		clocksource_32k.mult = clocksource_hz2mult(32768,
 					    clocksource_32k.shift);

Kevin Hilman

author

2007-11-13 22:45 UTC #2 lore raw

PATCH 2/2 ARM: OMAP: Update 32k sync timer for OMAP3

In reply to Kevin Hilman

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/plat-omap/common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/plat-omap/common.c +1 -1

Index: dev/arch/arm/plat-omap/common.c
===================================================================
@@ -191,7 +191,7 @@ console_initcall(omap_add_serial_console
 
 #if defined(CONFIG_ARCH_OMAP16XX)
 #define TIMER_32K_SYNCHRONIZED		0xfffbc410
-#elif defined(CONFIG_ARCH_OMAP24XX)
+#elif defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 #define TIMER_32K_SYNCHRONIZED		(OMAP2_32KSYNCT_BASE + 0x10)
 #endif

Tony Lindgren

2007-11-23 20:27 UTC #3 lore raw

In reply to Kevin Hilman

Quoted 4 lines · Kevin Hilman

A couple fixups to get OMAP3 working again after my previous 32k sync timer updates.
Tested on 3430SDP and 2430SDP.

Pushing today.

Tony