From patchwork Wed Feb 23 07:11:54 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paul Walmsley <paul@pwsan.com>
X-Patchwork-Id: 583551
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1N7DIEL015753
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 23 Feb 2011 07:13:18 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753283Ab1BWHNQ (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 23 Feb 2011 02:13:16 -0500
Received: from utopia.booyaka.com ([72.9.107.138]:58780 "EHLO
	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752253Ab1BWHNJ (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Wed, 23 Feb 2011 02:13:09 -0500
Received: (qmail 12736 invoked by uid 1019); 23 Feb 2011 07:13:08 -0000
MBOX-Line: From nobody Wed Feb 23 00:11:54 2011
Subject: [PATCH 8/8] OMAP2+: clockevent: late-init GPTIMER clockevent hwmod
	right before timer init
To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
From: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>, Kevin Hilman <khilman@ti.com>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	=?utf-8?q?Beno=C3=AEt?= Cousson <b-cousson@ti.com>
Date: Wed, 23 Feb 2011 00:11:54 -0700
Message-ID: <20110223071153.5874.58923.stgit@twilight.localdomain>
In-Reply-To: <20110223070455.5874.51326.stgit@twilight.localdomain>
References: <20110223070455.5874.51326.stgit@twilight.localdomain>
User-Agent: StGit/0.15
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 23 Feb 2011 07:13:18 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 0fc550e..a4e51a2 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -40,10 +40,11 @@
 #include <plat/dmtimer.h>
 #include <asm/localtimer.h>
 #include <asm/sched_clock.h>
+#include <plat/common.h>
 
 #include "timer-gp.h"
+#include <plat/omap_hwmod.h>
 
-#include <plat/common.h>
 
 /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */
 #define MAX_GPTIMER_ID		12
@@ -133,9 +134,13 @@ static void __init omap2_gp_clockevent_init(void)
 {
 	u32 tick_rate;
 	int src;
+	const char *clockevent_hwmod_name;
 
 	inited = 1;
 
+	clockevent_hwmod_name = (gptimer_id == 12) ? "timer12" : "timer1";
+	omap_hwmod_late_init_one(clockevent_hwmod_name);
+
 	gptimer = omap_dm_timer_request_specific(gptimer_id);
 	BUG_ON(gptimer == NULL);
 	gptimer_wakeup = gptimer;
@@ -250,6 +255,7 @@ static void __init omap2_gp_timer_init(void)
 		BUG_ON(!twd_base);
 	}
 #endif
+
 	omap_dm_timer_init();
 
 	omap2_gp_clockevent_init();