From 177199c9d3d95285dced0c9b84c54129f4f239e0 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jon-hunter@ti.com>
Date: Tue, 5 Jun 2012 12:34:52 -0500
Subject: [PATCH] --- yaml --- r: 313368 b: refs/heads/master c:
 d1c1691be5290bf7e5b11b63b6fda0d63a9f4937 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-omap2/timer.c               | 3 +++
 trunk/arch/arm/plat-omap/dmtimer.c              | 1 +
 trunk/arch/arm/plat-omap/include/plat/dmtimer.h | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08ebf1c76b3f..7dd51ebff0f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7b4ff764f7bf903e47eebdab661b1c38e791c6d
+refs/heads/master: d1c1691be5290bf7e5b11b63b6fda0d63a9f4937
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index b0b208077c96..d8a5dc3d695f 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -500,6 +500,9 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
 	pdata->set_timer_src = omap2_dm_timer_set_src;
 	pdata->timer_ip_version = oh->class->rev;
 
+	if (timer_dev_attr)
+		pdata->timer_capability = timer_dev_attr->timer_capability;
+
 	pwrdm = omap_hwmod_get_pwrdm(oh);
 	pdata->loses_context = pwrdm_can_ever_lose_context(pwrdm);
 #ifdef CONFIG_PM
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
index f5b5c89ac7c2..30742d8e6819 100644
--- a/trunk/arch/arm/plat-omap/dmtimer.c
+++ b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -694,6 +694,7 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
 	timer->pdev = pdev;
 	timer->loses_context = pdata->loses_context;
 	timer->get_context_loss_count = pdata->get_context_loss_count;
+	timer->capability = pdata->timer_capability;
 
 	/* Skip pm_runtime_enable for OMAP1 */
 	if (!pdata->needs_manual_reset) {
diff --git a/trunk/arch/arm/plat-omap/include/plat/dmtimer.h b/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
index 1e5ce5d56240..48e54caf9001 100644
--- a/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -101,6 +101,7 @@ struct dmtimer_platform_data {
 	bool loses_context;
 
 	int (*get_context_loss_count)(struct device *dev);
+	u32 timer_capability;
 };
 
 int omap_dm_timer_reserve_systimer(int id);
@@ -273,6 +274,7 @@ struct omap_dm_timer {
 	bool loses_context;
 	int ctx_loss_count;
 	int revision;
+	u32 capability;
 	struct platform_device *pdev;
 	struct list_head node;