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: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stephen Boyd 2014-10-22 17:33:01 -07:00 коммит произвёл Greg Kroah-Hartman
Родитель a12f1b406f
Коммит 97f7547103
1 изменённых файлов: 9 добавлений и 4 удалений

Просмотреть файл

@ -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);