--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
-@@ -1718,6 +1718,23 @@ static void pl011_put_poll_char(struct u
+@@ -1727,6 +1727,23 @@ static void pl011_put_poll_char(struct u
#endif /* CONFIG_CONSOLE_POLL */
static int pl011_hwinit(struct uart_port *port)
{
struct uart_amba_port *uap =
-@@ -1734,7 +1751,7 @@ static int pl011_hwinit(struct uart_port
+@@ -1743,7 +1760,7 @@ static int pl011_hwinit(struct uart_port
if (retval)
return retval;
/* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
-@@ -2421,7 +2438,7 @@ static int pl011_console_setup(struct co
+@@ -2440,7 +2457,7 @@ static int pl011_console_setup(struct co
plat->init();
}
if (uap->vendor->fixed_options) {
baud = uap->fixed_baud;
-@@ -2638,6 +2655,7 @@ static struct uart_driver amba_reg = {
+@@ -2657,6 +2674,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE,
};
static int pl011_probe_dt_alias(int index, struct device *dev)
{
struct device_node *np;
-@@ -2669,6 +2687,7 @@ static int pl011_probe_dt_alias(int inde
+@@ -2688,6 +2706,7 @@ static int pl011_probe_dt_alias(int inde
return ret;
}