Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Sat, 30 Jan 2010
 10:43:30 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o0UHhUuS020881	for
 <andy.sharp@lsi.com>; Sat, 30 Jan 2010 09:43:30 -0800
Received: from psmtp.com (na3sys009amx167.postini.com [74.125.149.93])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id o0UHcjrj023958	for
 <andy.sharp@lsi.com>; Sat, 30 Jan 2010 09:38:46 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx167.postini.com
 ([74.125.148.14]) with SMTP;	Sat, 30 Jan 2010 11:43:28 CST
Received: from localhost.localdomain ([127.0.0.1]:58397 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1493002Ab0A3RnW (ORCPT
        <rfc822;andy.sharp@lsi.com>); Sat, 30 Jan 2010 18:43:22 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 30 Jan 2010 18:43:03
 +0100 (CET)
Received: from sakura.staff.proxad.net ([213.228.1.107]:43139 "EHLO
        sakura.staff.proxad.net" rhost-flags-OK-OK-OK-OK)        by
 eddie.linux-mips.org with ESMTP id S1492196Ab0A3Rm7 (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Sat, 30 Jan 2010 18:42:59 +0100
Received: by sakura.staff.proxad.net (Postfix, from userid 1000)        id
 30B0E551083; Sat, 30 Jan 2010 18:42:59 +0100 (CET)
From: Maxime Bizon <mbizon@freebox.fr>
To: Greg Kroah-Hartman <gregkh@suse.de>, "linux-serial@vger.kernel.org"
	<linux-serial@vger.kernel.org>
CC: Ralf Baechle <ralf@linux-mips.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Maxime Bizon <mbizon@freebox.fr>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Sat, 30 Jan 2010 10:42:57 -0700
Subject: [PATCH 2/2] bcm63xx_uart: allow more than one uart to be registered.
Thread-Topic: [PATCH 2/2] bcm63xx_uart: allow more than one uart to be
 registered.
Thread-Index: Acqh07zbggodRTtVTb60/pcjr0OPnQ==
Message-ID: <1264873377-28479-3-git-send-email-mbizon@freebox.fr>
References: <1264873377-28479-1-git-send-email-mbizon@freebox.fr>
In-Reply-To: <1264873377-28479-1-git-send-email-mbizon@freebox.fr>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <mbizon@freebox.fr> [22/1] 
x-pstn-neptune: 0/0/0.00/0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

The bcm6358 CPU has two uarts, make it possible to use the second one.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
 drivers/serial/bcm63xx_uart.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c
index f78ede8..6ab959a 100644
--- a/drivers/serial/bcm63xx_uart.c
+++ b/drivers/serial/bcm63xx_uart.c
@@ -35,7 +35,7 @@
 #include <bcm63xx_regs.h>
 #include <bcm63xx_io.h>
=20
-#define BCM63XX_NR_UARTS	1
+#define BCM63XX_NR_UARTS	2
=20
 static struct uart_port ports[BCM63XX_NR_UARTS];
=20
@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver =3D {
 	.dev_name	=3D "ttyS",
 	.major		=3D TTY_MAJOR,
 	.minor		=3D 64,
-	.nr		=3D 1,
+	.nr		=3D 2,
 	.cons		=3D BCM63XX_CONSOLE,
 };
=20
@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_dev=
ice *pdev)
 	port->dev =3D &pdev->dev;
 	port->fifosize =3D 16;
 	port->uartclk =3D clk_get_rate(clk) / 2;
+	port->line =3D pdev->id;
 	clk_put(clk);
=20
 	ret =3D uart_add_one_port(&bcm_uart_driver, port);
--=20
1.6.3.3


