From patchwork Tue Mar 9 16:16:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 84343 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o29GGIIA031520 for ; Tue, 9 Mar 2010 16:16:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755254Ab0CIQQV (ORCPT ); Tue, 9 Mar 2010 11:16:21 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:59122 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754595Ab0CIQQT (ORCPT ); Tue, 9 Mar 2010 11:16:19 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o29GFq22007418 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 9 Mar 2010 10:15:52 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o29GFoJv010598; Tue, 9 Mar 2010 10:15:50 -0600 (CST) Received: from localhost (dtx0091359-ubuntu-1.am.dhcp.ti.com [128.247.79.73]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o29GFnZ01518; Tue, 9 Mar 2010 10:15:49 -0600 (CST) From: Sergio Aguirre To: linux-omap@vger.kernel.org Cc: Kevin Hilman , Vikram Pandita , Paul Walmsley , Tony Lindgren , Felipe Balbi , Sergio Aguirre Subject: [RFC part1/2 merge v3][PATCH 06/10] omap3: serial: Fix uart4 handling for 3630 Date: Tue, 9 Mar 2010 10:16:50 -0600 Message-Id: <1268151414-17071-7-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268151414-17071-1-git-send-email-saaguirre@ti.com> References: <1268151414-17071-1-git-send-email-saaguirre@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Mar 2010 16:16:22 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index c9e203b..02f992c 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -444,7 +444,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) omap_uart_smart_idle_enable(uart, 0); if (cpu_is_omap34xx()) { - u32 mod = (uart->num == 2) ? OMAP3430_PER_MOD : CORE_MOD; + u32 mod = (uart->num > 1) ? OMAP3430_PER_MOD : CORE_MOD; u32 wk_mask = 0; u32 padconf = 0; @@ -463,6 +463,10 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) wk_mask = OMAP3430_ST_UART3_MASK; padconf = 0x19e; break; + case 3: + wk_mask = OMAP3630_ST_UART4_MASK; + padconf = 0x0d2; + break; } uart->wk_mask = wk_mask; uart->padconf = padconf; @@ -694,6 +698,9 @@ void __init omap_serial_early_init(void) if (cpu_is_omap44xx()) p->irq += 32; + + if (cpu_is_omap3630() && (i == 3)) + p->irq = INT_36XX_UART4_IRQ; } } diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index b65088a..7d3820c 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -358,6 +358,8 @@ #define INT_35XX_CCDC_VD1_IRQ 92 #define INT_35XX_CCDC_VD2_IRQ 93 +#define INT_36XX_UART4_IRQ 80 + /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and * 16 MPUIO lines */ #define OMAP_MAX_GPIO_LINES 192