|
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
|
-@@ -1725,6 +1725,23 @@ static void pl011_put_poll_char(struct u
|
|
|
+@@ -1718,6 +1718,23 @@ static void pl011_put_poll_char(struct u
|
|
|
|
|
|
#endif /* CONFIG_CONSOLE_POLL */
|
|
|
|
|
@@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
static int pl011_hwinit(struct uart_port *port)
|
|
|
{
|
|
|
struct uart_amba_port *uap =
|
|
|
-@@ -1741,7 +1758,7 @@ static int pl011_hwinit(struct uart_port
|
|
|
+@@ -1734,7 +1751,7 @@ static int pl011_hwinit(struct uart_port
|
|
|
if (retval)
|
|
|
return retval;
|
|
|
|
|
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
/* Clear pending error and receive interrupts */
|
|
|
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
|
|
|
-@@ -2434,7 +2451,7 @@ static int pl011_console_setup(struct co
|
|
|
+@@ -2421,7 +2438,7 @@ static int pl011_console_setup(struct co
|
|
|
plat->init();
|
|
|
}
|
|
|
|
|
@@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
if (uap->vendor->fixed_options) {
|
|
|
baud = uap->fixed_baud;
|
|
|
-@@ -2651,6 +2668,7 @@ static struct uart_driver amba_reg = {
|
|
|
+@@ -2638,6 +2655,7 @@ static struct uart_driver amba_reg = {
|
|
|
.cons = AMBA_CONSOLE,
|
|
|
};
|
|
|
|
|
@@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
static int pl011_probe_dt_alias(int index, struct device *dev)
|
|
|
{
|
|
|
struct device_node *np;
|
|
|
-@@ -2682,6 +2700,7 @@ static int pl011_probe_dt_alias(int inde
|
|
|
+@@ -2669,6 +2687,7 @@ static int pl011_probe_dt_alias(int inde
|
|
|
|
|
|
return ret;
|
|
|
}
|