Commit b767ad72 authored by Aleksey Makarov's avatar Aleksey Makarov Committed by Greg Kroah-Hartman

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

The original patch makes the condition always true, so it is wrong.

It masks (but not fixes) the bug described in the commit message
but introduces a regression (no console is selected by SPCR)
in regular (no 'console=ttyAMA') case.

s/||/&&/ would not fix the problem as the root cause was identified
incorrectly.

This reverts commit aea9a80b.
Signed-off-by: default avatarAleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Tested-by: default avatarJayachandran C <jnair@caviumnetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 542ed784
...@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, ...@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx,
if (strcmp(name, "qdf2400_e44") == 0) { if (strcmp(name, "qdf2400_e44") == 0) {
pr_info_once("UART: Working around QDF2400 SoC erratum 44"); pr_info_once("UART: Working around QDF2400 SoC erratum 44");
qdf2400_e44_present = true; qdf2400_e44_present = true;
} else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) { } else if (strcmp(name, "pl011") != 0) {
return -ENODEV; return -ENODEV;
} }
......
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