Skip to content

Commit

Permalink
serial: bcm63xx_uart: allow more than one uart to be registered.
Browse files Browse the repository at this point in the history
The bcm6358 CPU has two uarts, make it possible to use the second one.

Signed-off-by: Maxime Bizon <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
mbizonfreebox authored and gregkh committed Mar 2, 2010
1 parent a6d07d1 commit 6a2c7ea
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/serial/bcm63xx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down Expand Up @@ -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,
};

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 6a2c7ea

Please sign in to comment.