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

Commit fea6dd14 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Greg Kroah-Hartman
Browse files

serial: 8250: pxa: add devicetree earlyconsole 



Transfer the device-tree pxa uart handling from 8250_of to the new
8250_pxa.  As a corollary, add the early console definition into
8250_pxa.

This enables to have the same uart node for the early console and the
normal uart.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba061c1a

drivers/tty/serial/8250/8250_of.c

+0 −2
Original line number Diff line number Diff line
@@ -332,8 +332,6 @@ static const struct of_device_id of_platform_serial_table[] = { 
		.data = (void *)PORT_ALTR_16550_F128, },

	{ .compatible = "mrvl,mmp-uart",

		.data = (void *)PORT_XSCALE, },

	{ .compatible = "mrvl,pxa-uart",

		.data = (void *)PORT_XSCALE, },

	{ /* end of list */ },

};

MODULE_DEVICE_TABLE(of, of_platform_serial_table);

drivers/tty/serial/8250/8250_pxa.c

+13 −0
Original line number Diff line number Diff line
@@ -172,6 +172,19 @@ static struct platform_driver serial_pxa_driver = { 


module_platform_driver(serial_pxa_driver);



static int __init early_serial_pxa_setup(struct earlycon_device *device,

				  const char *options)

{

	struct uart_port *port = &device->port;



	if (!(device->port.membase || device->port.iobase))

		return -ENODEV;



	port->regshift = 2;

	return early_serial8250_setup(device, NULL);

}

OF_EARLYCON_DECLARE(early_pxa, "mrvl,pxa-uart", early_serial_pxa_setup);



MODULE_AUTHOR("Sergei Ianovich");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:pxa2xx-uart");