Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c6e9112 authored by Grant Likely's avatar Grant Likely Committed by Greg Kroah-Hartman
Browse files

tty/serial: Relax the device_type restriction from of_serial 



There is no need to test for a device_type property in ns8250
compatible serial ports.  device_type is an OpenFirmware property that
is not required when using the flattened tree representation.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a2e6093c

drivers/tty/serial/of_serial.c

+9 −9
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ static int of_platform_serial_remove(struct platform_device *ofdev) 
 * A few common types, add more as needed.

 */

static struct of_device_id __devinitdata of_platform_serial_table[] = {

	{ .type = "serial", .compatible = "ns8250",   .data = (void *)PORT_8250, },

	{ .type = "serial", .compatible = "ns16450",  .data = (void *)PORT_16450, },

	{ .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, },

	{ .type = "serial", .compatible = "ns16550",  .data = (void *)PORT_16550, },

	{ .type = "serial", .compatible = "ns16750",  .data = (void *)PORT_16750, },

	{ .type = "serial", .compatible = "ns16850",  .data = (void *)PORT_16850, },

	{ .compatible = "ns8250",   .data = (void *)PORT_8250, },

	{ .compatible = "ns16450",  .data = (void *)PORT_16450, },

	{ .compatible = "ns16550a", .data = (void *)PORT_16550A, },

	{ .compatible = "ns16550",  .data = (void *)PORT_16550, },

	{ .compatible = "ns16750",  .data = (void *)PORT_16750, },

	{ .compatible = "ns16850",  .data = (void *)PORT_16850, },

#ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL

	{ .type = "serial", .compatible = "ibm,qpace-nwp-serial",

	{ .compatible = "ibm,qpace-nwp-serial",

		.data = (void *)PORT_NWPSERIAL, },

#endif

	{ .type = "serial",         .data = (void *)PORT_UNKNOWN, },