From patchwork Mon Jun 22 23:25:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vikram pandita X-Patchwork-Id: 31888 X-Patchwork-Delegate: tony@atomide.com 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 n5MNTHpi002911 for ; Mon, 22 Jun 2009 23:29:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751789AbZFVX3M (ORCPT ); Mon, 22 Jun 2009 19:29:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751577AbZFVX3M (ORCPT ); Mon, 22 Jun 2009 19:29:12 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:52092 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbZFVX3M (ORCPT ); Mon, 22 Jun 2009 19:29:12 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id n5MNT96T000628 for ; Mon, 22 Jun 2009 18:29:14 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id n5MNT7Db009059; Mon, 22 Jun 2009 18:29:07 -0500 (CDT) Received: from vip-tid (lta0307903-128247075087.am.dhcp.ti.com [128.247.75.87]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id n5MNT7916004; Mon, 22 Jun 2009 18:29:07 -0500 (CDT) Received: from vip-tid (localhost.localdomain [127.0.0.1]) by vip-tid (Postfix) with ESMTP id 4FC7A29C8D8; Mon, 22 Jun 2009 18:25:26 -0500 (CDT) Received: (from vikram@localhost) by vip-tid (8.14.3/8.14.3/Submit) id n5MNPQMH018339; Mon, 22 Jun 2009 18:25:26 -0500 X-Authentication-Warning: vip-tid: vikram set sender to vikram.pandita@ti.com using -f From: Vikram Pandita To: linux-omap@vger.kernel.org Cc: Vikram Pandita Subject: [PATCH v2] OMAP2: Zoom2: Pass irqflags to 8250 driver Date: Mon, 22 Jun 2009 18:25:26 -0500 Message-Id: <1245713126-18312-1-git-send-email-vikram.pandita@ti.com> X-Mailer: git-send-email 1.6.0.3.613.g9f8f13 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Pass irqflags to 8250 driver from zoom2 board file Zoom2 has IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq This patch is dependent on 8250 driver changes getting accepted upstream: Refer: http://patchwork.kernel.org/patch/31884/ Signed-off-by: Vikram Pandita Acked-by: Tony Lindgren --- Warning: could cause compilation break if 8250 patch is not integrated first arch/arm/mach-omap2/board-zoom-debugboard.c | 2 ++ arch/arm/mach-omap2/serial.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bac5c43..f546063 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .mapbase = 0x10000000, .irq = OMAP_GPIO_IRQ(102), .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, .iotype = UPIO_MEM, .regshift = 1, .uartclk = QUART_CLK, diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b094c15..45d4884 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -429,7 +429,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) omap_ctrl_writew(v, uart->padconf); } - p->flags |= UPF_SHARE_IRQ; + p->irqflags |= IRQF_SHARED; ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, "serial idle", (void *)uart); WARN_ON(ret);