Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f75471 authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

tty: serial: msm_serial: Use DT aliases 



We rely on probe order of this driver to determine the line number for
the uart port. This makes it impossible to know the line number
when these devices are populated via DT. Use the DT alias
mechanism to assign the line based on the aliases node.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a12f1b40

drivers/tty/serial/msm_serial.c

+9 −4
Original line number Diff line number Diff line
@@ -1044,17 +1044,22 @@ static int msm_serial_probe(struct platform_device *pdev) 
	struct resource *resource;

	struct uart_port *port;

	const struct of_device_id *id;

	int irq;

	int irq, line;



	if (pdev->id == -1)

		pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;



	if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))

	if (pdev->dev.of_node)

		line = of_alias_get_id(pdev->dev.of_node, "serial");

	else

		line = pdev->id;



	if (unlikely(line < 0 || line >= UART_NR))

		return -ENXIO;



	dev_info(&pdev->dev, "msm_serial: detected port #%d\n", pdev->id);

	dev_info(&pdev->dev, "msm_serial: detected port #%d\n", line);



	port = get_port_from_line(pdev->id);

	port = get_port_from_line(line);

	port->dev = &pdev->dev;

	msm_port = UART_TO_MSM(port);