[PATCH] serial/bcm63xx_uart: use correct alias naming

[PATCH] serial/bcm63xx_uart: use correct alias naming

[Jonas Gorski]

The bcm63xx_uart driver uses the of alias for determing its id. Recent
changes in dts files changed the expected 'uartX' to the recommended
'serialX', breaking serial output. Fix this by checking for a 'serialX'
alias as well.

Fixes: e3b992d028f8 ("MIPS: BMIPS: Improve BCM6328 device tree")
Fixes: 2d52ee82b475 ("MIPS: BMIPS: Improve BCM6368 device tree")
Fixes: 7537d273e2f3 ("MIPS: BMIPS: Add device tree example for BCM6358")
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---

Based on 4.7-rc2, which is the current head of tty-next.

 drivers/tty/serial/bcm63xx_uart.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index c28e5c24..5108fab 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -813,8 +813,12 @@ static int bcm_uart_probe(struct platform_device *pdev)
 	struct clk *clk;
 	int ret;
 
-	if (pdev->dev.of_node)
-		pdev->id = of_alias_get_id(pdev->dev.of_node, "uart");
+	if (pdev->dev.of_node) {
+		pdev->id = of_alias_get_id(pdev->dev.of_node, "serial");
+
+		if (pdev->id < 0)
+			pdev->id = of_alias_get_id(pdev->dev.of_node, "uart");
+	}
 
 	if (pdev->id < 0 || pdev->id >= BCM63XX_NR_UARTS)
 		return -EINVAL;
-- 
2.1.4

Re: [PATCH] serial/bcm63xx_uart: use correct alias naming

[Florian Fainelli]

On 06/08/2016 03:08 AM, Jonas Gorski wrote:
> The bcm63xx_uart driver uses the of alias for determing its id. Recent
> changes in dts files changed the expected 'uartX' to the recommended
> 'serialX', breaking serial output. Fix this by checking for a 'serialX'
> alias as well.
> 
> Fixes: e3b992d028f8 ("MIPS: BMIPS: Improve BCM6328 device tree")
> Fixes: 2d52ee82b475 ("MIPS: BMIPS: Improve BCM6368 device tree")
> Fixes: 7537d273e2f3 ("MIPS: BMIPS: Add device tree example for BCM6358")
> Signed-off-by: Jonas Gorski <jogo@openwrt.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

A future improvement could be to completely get rid of the id and
instead just dynamically allocate the ports structure.
-- 
Florian