From patchwork Mon Mar 15 23:04:08 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: 86045 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 o2FN2VGM009293 for ; Mon, 15 Mar 2010 23:02:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937089Ab0COXCg (ORCPT ); Mon, 15 Mar 2010 19:02:36 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:57774 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937081Ab0COXCd (ORCPT ); Mon, 15 Mar 2010 19:02:33 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2FN2Lde023838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 15 Mar 2010 18:02:21 -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 o2FN2LqA011127; Mon, 15 Mar 2010 18:02:21 -0500 (CDT) 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 o2FN2LZ29296; Mon, 15 Mar 2010 18:02:21 -0500 (CDT) From: Sergio Aguirre To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org, Sergio Aguirre Subject: [PATCH 3/7] omap2/3/4: serial: Remove condition for getting uart4_phys Date: Mon, 15 Mar 2010 18:04:08 -0500 Message-Id: <1268694252-21985-4-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268694252-21985-1-git-send-email-saaguirre@ti.com> References: <1268694252-21985-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]); Mon, 15 Mar 2010 23:02:38 +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,