Commit aea9a80b authored by Sudeep Holla's avatar Sudeep Holla Committed by Greg Kroah-Hartman

tty: serial: pl011: add ttyAMA for matching pl011 console

Commit c7cef0a8 ("console: Add extensible console matching") added
match() method to struct console which allows the console to perform
console command line matching instead of (or in addition to) default
console matching (ie., by fixed name and index).

Commit ad1696f6 ("ACPI: parse SPCR and enable matching console")
introduced support for SPCR as matching console.

Commit 10879ae5 ("serial: pl011: add console matching function")
added the match method for pl011 console which checks for the console
string to be "pl011"

Now on a platform which has both SPCR in the ACPI tables and ttyAMA in
the command line, the ttyAMA is chosen as "selected console" but it
doesn't pass the matching console method which results in CON_CONSDEV
not being set on the "selected console".

As a result of that, the bootconsole(SPCR in the above case) is not
unregistered and all the beginning boot messages are seen twice.

This patch adds "ttyAMA" so that it's considered to match pl011 console.

Fixes: 10879ae5 ("serial: pl011: add console matching function")
Cc: Russell King <linux@armlinux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Aleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8a1781b
...@@ -2340,7 +2340,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, ...@@ -2340,7 +2340,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx,
resource_size_t addr; resource_size_t addr;
int i; int i;
if (strcmp(name, "pl011") != 0) if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0)
return -ENODEV; return -ENODEV;
if (uart_parse_earlycon(options, &iotype, &addr, &options)) if (uart_parse_earlycon(options, &iotype, &addr, &options))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment