From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Subject: Re: [PATCH 04/16] serial: mvebu-uart: support probe of multiple ports Date: Fri, 06 Oct 2017 14:23:55 +0200 Message-ID: <87poa0foro.fsf@free-electrons.com> References: <20171006101344.15590-1-miquel.raynal@free-electrons.com> <20171006101344.15590-5-miquel.raynal@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20171006101344.15590-5-miquel.raynal-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> (Miquel Raynal's message of "Fri, 6 Oct 2017 12:13:32 +0200") Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Miquel Raynal Cc: Greg Kroah-Hartman , Linus Walleij , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Jiri Slaby , Catalin Marinas , Will Deacon , Thomas Petazzoni , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Allen Yan , Antoine Tenart , Nadav Haklai , linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Wilson Ding , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-gpio@vger.kernel.org Hi Miquel, On ven., oct. 06 2017, Miquel Raynal wrote: > From: Allen Yan > > 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 > Signed-off-by: Miquel Raynal > --- > 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 the id is retrieved using an of_ function, then I think that the driver would depend on OF_CONFIG. Gregory > + > + 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 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Fri, 06 Oct 2017 14:23:55 +0200 Subject: [PATCH 04/16] serial: mvebu-uart: support probe of multiple ports In-Reply-To: <20171006101344.15590-5-miquel.raynal@free-electrons.com> (Miquel Raynal's message of "Fri, 6 Oct 2017 12:13:32 +0200") References: <20171006101344.15590-1-miquel.raynal@free-electrons.com> <20171006101344.15590-5-miquel.raynal@free-electrons.com> Message-ID: <87poa0foro.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Miquel, On ven., oct. 06 2017, Miquel Raynal wrote: > From: Allen Yan > > 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 > Signed-off-by: Miquel Raynal > --- > 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 the id is retrieved using an of_ function, then I think that the driver would depend on OF_CONFIG. Gregory > + > + 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 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com