serial: of-serial: fetch line number from DT

PATCH New Lucas Stach 1 participant 1 message Dec 5, 2014

Subsystems (2)

TTY layer and serial drivers Tegra architecture support

lore

Share & tools

lore

Lucas Stach

author

2014-12-05 19:21 UTC #0 lore raw

PATCH 1/1 serial: of-serial: fetch line number from DT

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 <[email protected]>

Acked-by Olof Johansson <[email protected]>

---
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.

v2: move assignment outside if clause

---
 drivers/tty/serial/of_serial.c | 5 +++++
 1 file changed, 5 insertions(+)

drivers/tty/serial/of_serial.c +5 -0

index 8bc2563..8225960 100644
@@ -101,6 +101,11 @@ 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 */
+	ret = of_alias_get_id(np, "serial");
+	if (ret >= 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) {

Signature · 1 line

2.1.0