Skip to content

Commit

Permalink
serial: fsl_lpuart: Remove the alias node dependence
Browse files Browse the repository at this point in the history
Numbering the ttyLPn space should not depend on the generic name
"serial<n>".

If don't add the alias node like:"serial0 = &lpuart0;", then lpuart
will probe failed:
[    0.773410] fsl-lpuart 2950000.serial: failed to get alias id, errno -19

So remove the alias node dependence, and add the support for allocate the
line port automatically.

Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Vabhav Sharma authored and Greg Kroah-Hartman committed Oct 10, 2018
1 parent 4e1a606 commit 3bc3206
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/tty/serial/fsl_lpuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@
/* IMX lpuart has four extra unused regs located at the beginning */
#define IMX_REG_OFF 0x10

static DEFINE_IDA(fsl_lpuart_ida);

struct lpuart_port {
struct uart_port port;
struct clk *clk;
Expand Down Expand Up @@ -2143,8 +2145,11 @@ static int lpuart_probe(struct platform_device *pdev)

ret = of_alias_get_id(np, "serial");
if (ret < 0) {
dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
return ret;
ret = ida_simple_get(&fsl_lpuart_ida, 0, UART_NR, GFP_KERNEL);
if (ret < 0) {
dev_err(&pdev->dev, "port line is full, add device failed\n");
return ret;
}
}
if (ret >= ARRAY_SIZE(lpuart_ports)) {
dev_err(&pdev->dev, "serial%d out of range\n", ret);
Expand Down Expand Up @@ -2246,6 +2251,8 @@ static int lpuart_remove(struct platform_device *pdev)

uart_remove_one_port(&lpuart_reg, &sport->port);

ida_simple_remove(&fsl_lpuart_ida, sport->port.line);

clk_disable_unprepare(sport->clk);

if (sport->dma_tx_chan)
Expand Down Expand Up @@ -2384,6 +2391,7 @@ static int __init lpuart_serial_init(void)

static void __exit lpuart_serial_exit(void)
{
ida_destroy(&fsl_lpuart_ida);
platform_driver_unregister(&lpuart_driver);
uart_unregister_driver(&lpuart_reg);
}
Expand Down

0 comments on commit 3bc3206

Please sign in to comment.