aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/bcm63xx_uart.c
diff options
context:
space:
mode:
authorMaxime Bizon <mbizon@freebox.fr>2010-01-30 18:42:57 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 14:43:19 -0800
commit6a2c7eabfd09ca7986bf96b8958a87ca041a19d8 (patch)
treefb124167095299337b4207fe3aaeb24f431c6e42 /drivers/serial/bcm63xx_uart.c
parenta6d07d14bb5cc83237fb259014c1787ffdb83ccb (diff)
downloadkernel_samsung_tuna-6a2c7eabfd09ca7986bf96b8958a87ca041a19d8.zip
kernel_samsung_tuna-6a2c7eabfd09ca7986bf96b8958a87ca041a19d8.tar.gz
kernel_samsung_tuna-6a2c7eabfd09ca7986bf96b8958a87ca041a19d8.tar.bz2
serial: bcm63xx_uart: allow more than one uart to be registered.
The bcm6358 CPU has two uarts, make it possible to use the second one. Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/bcm63xx_uart.c')
-rw-r--r--drivers/serial/bcm63xx_uart.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c
index f78ede8..a1a0e55 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>
-#define BCM63XX_NR_UARTS 1
+#define BCM63XX_NR_UARTS 2
static struct uart_port ports[BCM63XX_NR_UARTS];
@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = {
.dev_name = "ttyS",
.major = TTY_MAJOR,
.minor = 64,
- .nr = 1,
+ .nr = BCM63XX_NR_UARTS,
.cons = BCM63XX_CONSOLE,
};
@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev)
port->dev = &pdev->dev;
port->fifosize = 16;
port->uartclk = clk_get_rate(clk) / 2;
+ port->line = pdev->id;
clk_put(clk);
ret = uart_add_one_port(&bcm_uart_driver, port);