Commit 6a2c7eab authored by Maxime Bizon's avatar Maxime Bizon Committed by Greg Kroah-Hartman

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: default avatarMaxime Bizon <mbizon@freebox.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a6d07d14
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <bcm63xx_regs.h> #include <bcm63xx_regs.h>
#include <bcm63xx_io.h> #include <bcm63xx_io.h>
#define BCM63XX_NR_UARTS 1 #define BCM63XX_NR_UARTS 2
static struct uart_port ports[BCM63XX_NR_UARTS]; static struct uart_port ports[BCM63XX_NR_UARTS];
...@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = { ...@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = {
.dev_name = "ttyS", .dev_name = "ttyS",
.major = TTY_MAJOR, .major = TTY_MAJOR,
.minor = 64, .minor = 64,
.nr = 1, .nr = BCM63XX_NR_UARTS,
.cons = BCM63XX_CONSOLE, .cons = BCM63XX_CONSOLE,
}; };
...@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev) ...@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev)
port->dev = &pdev->dev; port->dev = &pdev->dev;
port->fifosize = 16; port->fifosize = 16;
port->uartclk = clk_get_rate(clk) / 2; port->uartclk = clk_get_rate(clk) / 2;
port->line = pdev->id;
clk_put(clk); clk_put(clk);
ret = uart_add_one_port(&bcm_uart_driver, port); ret = uart_add_one_port(&bcm_uart_driver, port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment