[PATCH 04/16] serial: mvebu-uart: support probe of multiple ports
From: Miquel Raynal <hidden>
Date: 2017-10-06 10:13:32
Also in:
linux-devicetree, linux-gpio, linux-serial
Subsystem:
marvell armada 3700 serial driver, the rest, tty layer and serial drivers · Maintainers:
Pali Rohár, Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
From: Allen Yan <redacted> Until now, the mvebu-uart driver only supported probing a single UART port. However, some platforms have multiple instances of this UART controller, and therefore the driver should support multiple ports. In order to achieve this, we make sure to assign port->line properly, instead of hardcoding it to zero. Signed-off-by: Allen Yan <redacted> Signed-off-by: Miquel Raynal <redacted> --- drivers/tty/serial/mvebu-uart.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index 7e0a3e9fee15..25b11ede3a97 100644
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c@@ -560,7 +560,16 @@ static int mvebu_uart_probe(struct platform_device *pdev) return -EINVAL; } - port = &mvebu_uart_ports[0]; + if (pdev->dev.of_node) + pdev->id = of_alias_get_id(pdev->dev.of_node, "serial"); + + if (pdev->id >= MVEBU_NR_UARTS) { + dev_err(&pdev->dev, "cannot have more than %d UART ports\n", + MVEBU_NR_UARTS); + return -EINVAL; + } + + port = &mvebu_uart_ports[pdev->id]; spin_lock_init(&port->lock);
@@ -572,7 +581,7 @@ static int mvebu_uart_probe(struct platform_device *pdev) port->fifosize = 32; port->iotype = UPIO_MEM32; port->flags = UPF_FIXED_PORT; - port->line = 0; /* single port: force line number to 0 */ + port->line = pdev->id; port->irq = irq->start; port->irqflags = 0;
--
2.11.0