From patchwork Sat Apr 4 20:54:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 16347 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n34KtMiK017120 for ; Sat, 4 Apr 2009 20:55:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754610AbZDDUzN (ORCPT ); Sat, 4 Apr 2009 16:55:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756469AbZDDUzM (ORCPT ); Sat, 4 Apr 2009 16:55:12 -0400 Received: from utopia.booyaka.com ([72.9.107.138]:38003 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755983AbZDDUzH (ORCPT ); Sat, 4 Apr 2009 16:55:07 -0400 Received: (qmail 1350 invoked by uid 526); 4 Apr 2009 20:55:04 -0000 MBOX-Line: From nobody Sat Apr 4 14:54:08 2009 From: Paul Walmsley Subject: [PATCH 1/3] OMAP3 GPTIMER: fix GPTIMER12 IRQ To: linux-omap@vger.kernel.org Cc: Paul Walmsley , Tony Lindgren Date: Sat, 04 Apr 2009 14:54:08 -0600 Message-ID: <20090404205407.12269.91269.stgit@localhost.localdomain> In-Reply-To: <20090404205333.12269.76287.stgit@localhost.localdomain> References: <20090404205333.12269.76287.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3.222.gddca MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org GPTIMER12 IRQ is at IRQ 95 on OMAP3, unlike OMAP2. (ref: OMAP34xx Multimedia High Security (HS) Device Silicon Revision 3.0 Security Addendum Rev. B, SWPU119B) Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/dmtimer.c | 2 +- 1 files changed, 1 insertions(+), 1 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 diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index bfd4757..c99d611 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -238,7 +238,7 @@ static struct omap_dm_timer omap3_dm_timers[] = { { .phys_base = 0x49040000, .irq = INT_24XX_GPTIMER9 }, { .phys_base = 0x48086000, .irq = INT_24XX_GPTIMER10 }, { .phys_base = 0x48088000, .irq = INT_24XX_GPTIMER11 }, - { .phys_base = 0x48304000, .irq = INT_24XX_GPTIMER12 }, + { .phys_base = 0x48304000, .irq = INT_34XX_GPT12_IRQ }, }; static const char *omap3_dm_source_names[] __initdata = {