From: Jon Hunter Date: Fri, 6 Jul 2012 21:46:35 +0000 (-0500) Subject: ARM: OMAP: Fix dmtimer reset for timer1 X-Git-Tag: omap-for-v3.8/timer-signed^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc957bd83b623fa6ead068bf1a444decce2cc00;p=pandora-kernel.git ARM: OMAP: Fix dmtimer reset for timer1 In commit e32f7ec2 (ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1) a fix was added to prevent timer1 being reset in the function omap_dm_timer_reset() because timer1 was being used as the system timer for OMAP2 devices. Although timer1 is still used by most OMAP2+ devices as a system timer, the function omap_dm_timer_reset() is now only being called for OMAP1 devices and OMAP1 does not use timer1 as a system timer. Therefore, remove the check in omap_dm_timer_reset() so that timer1 is reset for OMAP1 devices. Signed-off-by: Jon Hunter Acked-by: Santosh Shilimkar --- Reading git-diff-tree failed