|
|
@@ -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 |
|
|
|
-@@ -2305,7 +2322,7 @@ static int __init pl011_console_setup(st
|
|
|
+@@ -2321,7 +2338,7 @@ static int __init pl011_console_setup(st
|
|
|
plat->init();
|
|
|
}
|
|
|
|
|
|
@@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <[email protected]>
|
|
|
|
|
|
if (uap->vendor->fixed_options) {
|
|
|
baud = uap->fixed_baud;
|
|
|
-@@ -2432,6 +2449,7 @@ static struct uart_driver amba_reg = {
|
|
|
+@@ -2448,6 +2465,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;
|
|
|
-@@ -2463,6 +2481,7 @@ static int pl011_probe_dt_alias(int inde
|
|
|
+@@ -2479,6 +2497,7 @@ static int pl011_probe_dt_alias(int inde
|
|
|
|
|
|
return ret;
|
|
|
}
|