| Message ID | 1416904016-5567-1-git-send-email-dev@lynxeye.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 11/25/2014 11:26 AM, Lucas Stach wrote: > The general agreed way to specify a fixed line number > for a serial console is to provide a "serial" alias > in the devicetree. Start parsing this property in > of_serial. > Signed-off-by: Lucas Stach <dev@lynxeye.de> > Acked-by: Olof Johansson <olof@lixom.net> > --- > As 3.16-rc6 landed the fix to avoid the regression that this patch > was causing on Tegra it should be safe to reapply it. > --- > drivers/tty/serial/of_serial.c | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c > index 8bc2563..920a831 100644 > --- a/drivers/tty/serial/of_serial.c > +++ b/drivers/tty/serial/of_serial.c > @@ -101,6 +101,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, > if (of_property_read_u32(np, "fifo-size", &prop) == 0) > port->fifosize = prop; > > + /* Check for a fixed line number */ > + if ((ret = of_alias_get_id(np, "serial")) >= 0) Don't use assignment in the *if* statement. If you would have ran your patch thru scripts/checkpatch.pl, it would have complained about that. > + port->line = ret; > + WBR, Sergei
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 8bc2563..920a831 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -101,6 +101,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, if (of_property_read_u32(np, "fifo-size", &prop) == 0) port->fifosize = prop; + /* Check for a fixed line number */ + if ((ret = of_alias_get_id(np, "serial")) >= 0) + port->line = ret; + port->irq = irq_of_parse_and_map(np, 0); port->iotype = UPIO_MEM; if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {