Skip to contentSkip to conversation

of_serial: Add UPF_FIXED_TYPE flag

PATCH In review Dave Mitchell 3 participants 3 messages Jun 9, 2009 – Jun 19, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of_serial: Add UPF_FIXED_TYPE flag

This patch adds the UPF_FIXED_TYPE flag which will bypass the 8250's autoconfig probe for uart type. The uart type identified by the of_serial's parse of the flat device tree will be utilized as defined.

---
 drivers/serial/of_serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/of_serial.c +1 -1
index 14f8fa9..3f2027c 100644
@@ -67,7 +67,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
 	port->type = type;
 	port->uartclk = *clk;
 	port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
-		| UPF_FIXED_PORT;
+		| UPF_FIXED_PORT | UPF_FIXED_TYPE;
 	port->dev = &ofdev->dev;
 	/* If current-speed was set, then try not to change it. */
 	if (spd)
Signature · 1 line
1.6.3.2
#1 lore raw
Quoted 15 lines · Dave Mitchell

This patch adds the UPF_FIXED_TYPE flag which will bypass the 8250's autoconfig probe for uart type. The uart type identified by the of_serial's parse of the flat device tree will be utilized as defined.

---
 drivers/serial/of_serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/of_serial.c +0 -0
index 14f8fa9..3f2027c 100644

drivers/serial/of_serial.c static int __devinit of_platform_serial_setup(struct of_device *ofdev, · line 70

Quoted 5 lines
drivers/serial/of_serial.c +1 -1
@@ -67,7 +67,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
 	port->type = type;
 	port->uartclk = *clk;
 	port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
-		| UPF_FIXED_PORT;
+		| UPF_FIXED_PORT | UPF_FIXED_TYPE;

I think we /probably/ want a similar change in legacy_serial.c, for soc ports at least.

Or do people have things that are compatible "ns16550" but aren't?

cheers

#2 lore raw
Quoted 6 lines · Michael Ellerman

I think we /probably/ want a similar change in legacy_serial.c, for soc
ports at least.

Or do people have things that are compatible "ns16550" but aren't?

Do we really want to keep of_serial.c ?

I fail to see the point in keeping -both- the of_serial (of_device variant) and the legacy serial stuff which shims the device-tree into platform devices.

They tend to clash with each other too, which is annoying.

Cheers,
Ben