---

yaml --- r: 31698 b: refs/heads/master c: 35912c7 h: refs/heads/master v: v3
git-mirror · Jul 1, 2006 · 9e6d662 · 9e6d662
1 parent cc84c6f
commit 9e6d662
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff0daca525dde796382b9ccd563f169df2571211
+refs/heads/master: 35912c799722f0c63b8c2c49c7650d4516a5fe8a
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -260,7 +260,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 	for (i = 0; i < dm_timer_count; i++) {
 		u32 l;
 
-		l = omap_dm_timer_read_reg(&dm_timers[n], OMAP_TIMER_CTRL_REG);
+		l = omap_dm_timer_read_reg(&dm_timers[i], OMAP_TIMER_CTRL_REG);
 		if (l & OMAP_TIMER_CTRL_ST) {
 			if (((omap_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0)
 				inputmask &= ~(1 << 1);

diff --git a/trunk/arch/arm/plat-omap/timer32k.c b/trunk/arch/arm/plat-omap/timer32k.c
@@ -51,6 +51,7 @@
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
+#include <asm/arch/dmtimer.h>
 
 struct sys_timer omap_timer;
 
@@ -118,8 +119,6 @@ static inline void omap_32k_timer_stop(void)
 
 #elif defined(CONFIG_ARCH_OMAP2)
 
-#include <asm/arch/dmtimer.h>
-
 static struct omap_dm_timer *gptimer;
 
 static inline void omap_32k_timer_start(unsigned long load_val)
@@ -275,6 +274,7 @@ static __init void omap_init_32k_timer(void)
 	omap_timer.offset  = omap_32k_timer_gettimeoffset;
 	omap_32k_last_tick = omap_32k_sync_timer_read();
 
+#ifdef CONFIG_ARCH_OMAP2
 	/* REVISIT: Check 24xx TIOCP_CFG settings after idle works */
 	if (cpu_is_omap24xx()) {
 		gptimer = omap_dm_timer_request_specific(1);
@@ -286,6 +286,7 @@ static __init void omap_init_32k_timer(void)
 			OMAP_TIMER_INT_CAPTURE | OMAP_TIMER_INT_OVERFLOW |
 			OMAP_TIMER_INT_MATCH);
 	}
+#endif
 
 	omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
 }