From 4f765922f087b80ebfb9b229697a41fca1bbad5e Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 18 Jun 2018 14:34:16 +0200 Subject: kernel: bump 4.9 to 4.9.109 for 18.06 Refreshed all patches Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- .../950-0087-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch | 2 +- .../patches-4.9/950-0195-amba_pl011-Round-input-clock-up.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/linux/brcm2708/patches-4.9/950-0087-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/brcm2708/patches-4.9/950-0087-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index 2710ed63d7..a6f0346823 100644 --- a/target/linux/brcm2708/patches-4.9/950-0087-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/brcm2708/patches-4.9/950-0087-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -14,7 +14,7 @@ use the same logic. --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2501,7 +2501,12 @@ static int pl011_setup_port(struct devic +@@ -2517,7 +2517,12 @@ static int pl011_setup_port(struct devic if (IS_ERR(base)) return PTR_ERR(base); diff --git a/target/linux/brcm2708/patches-4.9/950-0195-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.9/950-0195-amba_pl011-Round-input-clock-up.patch index b981be02ac..ad532c511d 100644 --- a/target/linux/brcm2708/patches-4.9/950-0195-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/brcm2708/patches-4.9/950-0195-amba_pl011-Round-input-clock-up.patch @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* 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 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 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; } -- cgit v1.2.3