From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miquel RAYNAL Subject: Re: [PATCH 04/16] serial: mvebu-uart: support probe of multiple ports Date: Mon, 9 Oct 2017 09:17:11 +0200 Message-ID: <20171009091711.528adddd@xps13> References: <20171006101344.15590-1-miquel.raynal@free-electrons.com> <20171006101344.15590-5-miquel.raynal@free-electrons.com> <87poa0foro.fsf@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <87poa0foro.fsf-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Gregory CLEMENT 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 On Fri, 06 Oct 2017 14:23:55 +0200 Gregory CLEMENT wrote: > 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. Is this okay? if (pdev->dev.of_node && IS_ENABLED(CONFIG_OF)) pdev->id = of_alias_get_id(pdev->dev.of_node, "serial"); else pdev->id = 0; BTW, I could not test without CONFIG_OF as it is defined by default in our case: Selected by: ARM64 [=y] I don't think there will be a 32-bit SoC with this UART IP? Thanks, Miquèl > > 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 > -- Miquel Raynal, Free Electrons Embedded Linux and Kernel engineering 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: miquel.raynal@free-electrons.com (Miquel RAYNAL) Date: Mon, 9 Oct 2017 09:17:11 +0200 Subject: [PATCH 04/16] serial: mvebu-uart: support probe of multiple ports In-Reply-To: <87poa0foro.fsf@free-electrons.com> References: <20171006101344.15590-1-miquel.raynal@free-electrons.com> <20171006101344.15590-5-miquel.raynal@free-electrons.com> <87poa0foro.fsf@free-electrons.com> Message-ID: <20171009091711.528adddd@xps13> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 06 Oct 2017 14:23:55 +0200 Gregory CLEMENT wrote: > 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. Is this okay? if (pdev->dev.of_node && IS_ENABLED(CONFIG_OF)) pdev->id = of_alias_get_id(pdev->dev.of_node, "serial"); else pdev->id = 0; BTW, I could not test without CONFIG_OF as it is defined by default in our case: Selected by: ARM64 [=y] I don't think there will be a 32-bit SoC with this UART IP? Thanks, Miqu?l > > 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 > -- Miquel Raynal, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com