From patchwork Tue Nov 24 19:58:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 62556 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 nAOJx2k5013800 for ; Tue, 24 Nov 2009 19:59:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932796AbZKXT6y (ORCPT ); Tue, 24 Nov 2009 14:58:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932794AbZKXT6y (ORCPT ); Tue, 24 Nov 2009 14:58:54 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:59001 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932789AbZKXT6y (ORCPT ); Tue, 24 Nov 2009 14:58:54 -0500 Received: by pwi3 with SMTP id 3so4379144pwi.21 for ; Tue, 24 Nov 2009 11:59:00 -0800 (PST) Received: by 10.115.101.27 with SMTP id d27mr13218792wam.126.1259092740239; Tue, 24 Nov 2009 11:59:00 -0800 (PST) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 21sm1066892pzk.3.2009.11.24.11.58.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 24 Nov 2009 11:58:59 -0800 (PST) To: "Govindraj.R" Cc: linux-omap@vger.kernel.org Subject: Re: [PATCHv3 1/3] OMAP UART: Add omap-serial driver support. References: <35817.192.168.10.88.1256713980.squirrel@dbdmail.itg.ti.com> <45113.192.168.10.88.1258095234.squirrel@dbdmail.itg.ti.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Tue, 24 Nov 2009 11:58:58 -0800 In-Reply-To: <45113.192.168.10.88.1258095234.squirrel@dbdmail.itg.ti.com> (Govindraj R.'s message of "Fri\, 13 Nov 2009 12\:23\:54 +0530 \(IST\)") Message-ID: <87aaybu22l.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 4341fae..86bec82 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -28,7 +28,7 @@ * in bootargs we specify as console=ttyO0 if uart1 * is used as console uart. */ -#define DEVICE_NAME "ttyO" +#define DEVICE_NAME "ttyS" /* * * We default to IRQ0 for the "no irq" hack. Some diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c index 6dd8bb4..65d05f8 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/serial/omap-serial.c @@ -993,7 +993,7 @@ static struct console serial_omap_console = { static void serial_omap_add_console_port(struct uart_omap_port *up) { - serial_omap_console_ports[up->pdev->id - 1] = up; + serial_omap_console_ports[up->pdev->id] = up; } #define OMAP_CONSOLE (&serial_omap_console) @@ -1237,7 +1237,7 @@ static int serial_omap_probe(struct platform_device *pdev) up->port.regshift = 2; up->port.fifosize = 64; up->port.ops = &serial_omap_pops; - up->port.line = pdev->id - 1; + up->port.line = pdev->id; up->port.membase = ioremap_nocache(up->port.mapbase, 0x16 << up->port.regshift); up->port.flags = UPF_BOOT_AUTOCONF; @@ -1263,7 +1263,7 @@ static int serial_omap_probe(struct platform_device *pdev) pr_err("\n %s: UART Driver Init Failed!\n", __func__); return -EPERM; } - ui[pdev->id - 1] = up; + ui[pdev->id] = up; serial_omap_add_console_port(up); ret = uart_add_one_port(&serial_omap_reg, &up->port); @@ -1298,7 +1298,7 @@ static struct platform_driver serial_omap_driver = { .suspend = serial_omap_suspend, .resume = serial_omap_resume, .driver = { - .name = "omap-uart", + .name = DRIVER_NAME, }, };