From patchwork Wed Feb 24 07:30:30 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: 81621 X-Patchwork-Delegate: tony@atomide.com 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 o1O7UbvJ018320 for ; Wed, 24 Feb 2010 07:30:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755422Ab0BXHah (ORCPT ); Wed, 24 Feb 2010 02:30:37 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:38546 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752477Ab0BXHag (ORCPT ); Wed, 24 Feb 2010 02:30:36 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1O7UXXf022865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 24 Feb 2010 01:30:33 -0600 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o1O7UXNA010832; Wed, 24 Feb 2010 01:30:33 -0600 (CST) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o1O7UXPn029736; Wed, 24 Feb 2010 01:30:33 -0600 (CST) Received: from dlee02.ent.ti.com ([157.170.170.17]) by dlee73.ent.ti.com ([157.170.170.88]) with mapi; Wed, 24 Feb 2010 01:30:33 -0600 From: "Aguirre, Sergio" To: Tony Lindgren CC: "linux-omap@vger.kernel.org" , "Sonasath, Moiz" , "Pandita, Vikram" Date: Wed, 24 Feb 2010 01:30:30 -0600 Subject: [PATCH] omap2/3/4: serial: Half revert multiboot changes Thread-Topic: [PATCH] omap2/3/4: serial: Half revert multiboot changes Thread-Index: Acq1Iz38SsZTSxQ3ThuJF+Z9lbaMQQ== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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]); Wed, 24 Feb 2010 07:30:38 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b79bc89..fe3122b 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, @@ -132,11 +131,6 @@ 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) { @@ -597,7 +591,7 @@ static struct omap_uart_state omap_uart[] = { }, }, }, -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) +#ifdef CONFIG_ARCH_OMAP4 { .pdev = { .name = "serial8250", @@ -764,7 +758,7 @@ void __init omap_serial_init(void) { int i, nr_ports; - if (!(cpu_is_omap3630() || cpu_is_omap4430())) + if (!cpu_is_omap4430()) nr_ports = 3; else nr_ports = ARRAY_SIZE(omap_uart);