From 13129f309ee51fc2742ee6d7698de2136fb4d60a Mon Sep 17 00:00:00 2001
From: Jon Hunter <jon-hunter@ti.com>
Date: Fri, 28 Sep 2012 18:03:29 -0500
Subject: [PATCH] --- yaml --- r: 339935 b: refs/heads/master c:
 61b001c564b75bfb47bfb84b33008fc2a35c9a84 h: refs/heads/master i:   339933:
 f58a3c3aa5ee2167cadcdcbf759b3d63c843866a   339931:
 3ed34832c7ca778b0db27a1fc027f2d27c6ffd12   339927:
 1fcc561f24a50e78ec245a470942878c66b391cd   339919:
 caf4057b588ed6914eb602e19bbbc8a715d88d55   339903:
 7bf64c10ce994fcee5dd36256ae7924abaf29f78 v: v3

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

diff --git a/[refs] b/[refs]
index 896a16ada72e..540874d18502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0cadb3c86fc99553b1f5c38c7770be1ad52aa26
+refs/heads/master: 61b001c564b75bfb47bfb84b33008fc2a35c9a84
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index 099e4060afe9..e9fcc5faff5c 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -245,8 +245,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 	const char *oh_name;
 	struct device_node *np;
 	struct omap_hwmod *oh;
-	struct resource irq_rsrc, mem_rsrc;
-	size_t size;
+	struct resource irq, mem;
 	int res = 0;
 	int r;
 
@@ -280,20 +279,18 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 
 	if (!of_have_populated_dt()) {
 		r = omap_hwmod_get_resource_byname(oh, IORESOURCE_IRQ, NULL,
-						   &irq_rsrc);
+						   &irq);
 		if (r)
 			return -ENXIO;
-		timer->irq = irq_rsrc.start;
+		timer->irq = irq.start;
 
 		r = omap_hwmod_get_resource_byname(oh, IORESOURCE_MEM, NULL,
-						   &mem_rsrc);
+						   &mem);
 		if (r)
 			return -ENXIO;
-		timer->phys_base = mem_rsrc.start;
-		size = mem_rsrc.end - mem_rsrc.start;
 
 		/* Static mapping, never released */
-		timer->io_base = ioremap(timer->phys_base, size);
+		timer->io_base = ioremap(mem.start, mem.end - mem.start);
 	}
 
 	if (!timer->io_base)
diff --git a/trunk/arch/arm/plat-omap/include/plat/dmtimer.h b/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
index 40383b68a099..b60e2b66ad18 100644
--- a/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -261,7 +261,6 @@ int omap_dm_timers_active(void);
 		(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))
 
 struct omap_dm_timer {
-	unsigned long phys_base;
 	int id;
 	int irq;
 	struct clk *fclk;