diff options
author | Maxime Bizon <mbizon@freebox.fr> | 2010-01-30 12:42:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:43:19 -0500 |
commit | 6a2c7eabfd09ca7986bf96b8958a87ca041a19d8 (patch) | |
tree | fb124167095299337b4207fe3aaeb24f431c6e42 /drivers/serial/bcm63xx_uart.c | |
parent | a6d07d14bb5cc83237fb259014c1787ffdb83ccb (diff) |
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c index f78ede824104..a1a0e55d0807 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/serial/bcm63xx_uart.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <bcm63xx_regs.h> | 35 | #include <bcm63xx_regs.h> |
36 | #include <bcm63xx_io.h> | 36 | #include <bcm63xx_io.h> |
37 | 37 | ||
38 | #define BCM63XX_NR_UARTS 1 | 38 | #define BCM63XX_NR_UARTS 2 |
39 | 39 | ||
40 | static struct uart_port ports[BCM63XX_NR_UARTS]; | 40 | static struct uart_port ports[BCM63XX_NR_UARTS]; |
41 | 41 | ||
@@ -784,7 +784,7 @@ static struct uart_driver bcm_uart_driver = { | |||
784 | .dev_name = "ttyS", | 784 | .dev_name = "ttyS", |
785 | .major = TTY_MAJOR, | 785 | .major = TTY_MAJOR, |
786 | .minor = 64, | 786 | .minor = 64, |
787 | .nr = 1, | 787 | .nr = BCM63XX_NR_UARTS, |
788 | .cons = BCM63XX_CONSOLE, | 788 | .cons = BCM63XX_CONSOLE, |
789 | }; | 789 | }; |
790 | 790 | ||
@@ -826,6 +826,7 @@ static int __devinit bcm_uart_probe(struct platform_device *pdev) | |||
826 | port->dev = &pdev->dev; | 826 | port->dev = &pdev->dev; |
827 | port->fifosize = 16; | 827 | port->fifosize = 16; |
828 | port->uartclk = clk_get_rate(clk) / 2; | 828 | port->uartclk = clk_get_rate(clk) / 2; |
829 | port->line = pdev->id; | ||
829 | clk_put(clk); | 830 | clk_put(clk); |
830 | 831 | ||
831 | ret = uart_add_one_port(&bcm_uart_driver, port); | 832 | ret = uart_add_one_port(&bcm_uart_driver, port); |