diff mbox

[3/3] OMAP: dmtimer: enable all timers to be wakeup events

Message ID 20090404205409.12269.94966.stgit@localhost.localdomain (mailing list archive)
State Accepted
Commit 7287a91be3de9ee00f8da7c07f19b368fd0969ae
Headers show

Commit Message

Paul Walmsley April 4, 2009, 8:54 p.m. UTC 
From: Kevin Hilman <khilman@deeprootsystems.com>

All GP timers on OMAP2/3 can generate wakeup events.  The wakeup status is
cleared in the PRCM interrupt handler.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/clock24xx.h |    4 ++--
 arch/arm/plat-omap/dmtimer.c    |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Tony Lindgren April 7, 2009, 5:48 p.m. UTC | #1 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 7287a91be3de9ee00f8da7c07f19b368fd0969ae

PatchWorks
http://patchwork.kernel.org/patch/16349/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=7287a91be3de9ee00f8da7c07f19b368fd0969ae


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren April 7, 2009, 6:04 p.m. UTC | #2 
* Tony Lindgren <tony@atomide.com> [090407 10:49]:
> This patch has been applied to the linux-omap
> by youw fwiendly patch wobot.
> 
> Initial commit ID (Likely to change): 7287a91be3de9ee00f8da7c07f19b368fd0969ae
> 
> PatchWorks
> http://patchwork.kernel.org/patch/16349/
> 
> Git
> http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=7287a91be3de9ee00f8da7c07f19b368fd0969ae

Well let's change the order of these patches, if you can sink #3
before #3 as we discussed on the phone. This way if adding the
gpt 12 support for Beagle is considered too intrusive, it's
easier to drop from omap-fixes and move to for-next instead.

So dropping all three until you have the updated series available.

Thanks,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index 72003f7..88c5acb 100644
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -625,8 +625,8 @@  static struct clk func_32k_ck = {
 	.clkdm_name	= "wkup_clkdm",
 };
 
-static struct clk secure_32k_fck = {
-	.name		= "secure_32k_fck",
+static struct clk secure_32k_ck = {
+	.name		= "secure_32k_ck",
 	.ops		= &clkops_null,
 	.rate		= 32768,
 	.flags		= RATE_FIXED,
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index bf2b8ea..55bb996 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -321,11 +321,9 @@  static void omap_dm_timer_reset(struct omap_dm_timer *timer)
 	l |= 0x2 << 8;   /* Set clock activity to perserve f-clock on idle */
 
 	/*
-	 * Enable wake-up only for GPT1 on OMAP2 CPUs.
-	 * FIXME: All timers should have wake-up enabled and clear
-	 * PRCM status.
+	 * Enable wake-up on OMAP2 CPUs.
 	 */
-	if (cpu_class_is_omap2() && (timer == &dm_timers[0]))
+	if (cpu_class_is_omap2())
 		l |= 1 << 2;
 	omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, l);