From patchwork Fri Mar 12 20:00:05 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: 85356 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 o2CJwvLj009095 for ; Fri, 12 Mar 2010 19:58:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758636Ab0CLT65 (ORCPT ); Fri, 12 Mar 2010 14:58:57 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:55081 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758432Ab0CLT6x (ORCPT ); Fri, 12 Mar 2010 14:58:53 -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 o2CJwicb009753 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 12 Mar 2010 13:58:44 -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 o2CJwf70015152; Fri, 12 Mar 2010 13:58:41 -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 o2CJwfZ13722; Fri, 12 Mar 2010 13:58:41 -0600 (CST) From: Sergio Aguirre To: Tony Lindgren Cc: linux-omap@vger.kernel.org, Kevin Hilman , Vikram Pandita , Paul Walmsley , Felipe Balbi , Sergio Aguirre Subject: [PATCH 3/7] omap2/3/4: serial: Remove condition for getting uart4_phys Date: Fri, 12 Mar 2010 14:00:05 -0600 Message-Id: <1268424009-18974-4-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268424009-18974-1-git-send-email-saaguirre@ti.com> References: <1268424009-18974-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]); Fri, 12 Mar 2010 19:58:58 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index a55e6ae..3771254 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -115,7 +115,6 @@ static struct plat_serial8250_port serial_platform_data2[] = { } }; -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) static struct plat_serial8250_port serial_platform_data3[] = { { .irq = 70, @@ -128,23 +127,12 @@ static struct plat_serial8250_port serial_platform_data3[] = { } }; -static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) -{ - serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; -} -#else -static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) -{ -} -#endif - void __init omap2_set_globals_uart(struct omap_globals *omap2_globals) { serial_platform_data0[0].mapbase = omap2_globals->uart1_phys; serial_platform_data1[0].mapbase = omap2_globals->uart2_phys; serial_platform_data2[0].mapbase = omap2_globals->uart3_phys; - if (cpu_is_omap3630() || cpu_is_omap44xx()) - omap2_set_globals_uart4(omap2_globals); + serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; } static inline unsigned int __serial_read_reg(struct uart_port *up,