diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:39:42 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:29:32 +0100 |
commit | f80272dd9c40dae4aeff38fa5c7132a0f5fc198c (patch) | |
tree | f67e8c7c33caf3eb39fceaa545472e4cc204388e /target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch | |
parent | 3030abfa7e9ac73ee54b4ac9e9a784775001d750 (diff) | |
download | upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.gz upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.bz2 upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.zip |
kernel: bump 4.14 to 4.14.159
Refreshed all patches.
Remove upstreamed:
- 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch index 90afc6f871..c32d58fa74 100644 --- a/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1672,6 +1672,23 @@ static void pl011_put_poll_char(struct u +@@ -1670,6 +1670,23 @@ static void pl011_put_poll_char(struct u #endif /* CONFIG_CONSOLE_POLL */ @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static int pl011_hwinit(struct uart_port *port) { struct uart_amba_port *uap = -@@ -1688,7 +1705,7 @@ static int pl011_hwinit(struct uart_port +@@ -1686,7 +1703,7 @@ static int pl011_hwinit(struct uart_port if (retval) return retval; @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* Clear pending error and receive interrupts */ pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | -@@ -2344,7 +2361,7 @@ static int __init pl011_console_setup(st +@@ -2342,7 +2359,7 @@ static int __init pl011_console_setup(st plat->init(); } @@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> if (uap->vendor->fixed_options) { baud = uap->fixed_baud; -@@ -2529,6 +2546,7 @@ static struct uart_driver amba_reg = { +@@ -2527,6 +2544,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; @@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; -@@ -2560,6 +2578,7 @@ static int pl011_probe_dt_alias(int inde +@@ -2558,6 +2576,7 @@ static int pl011_probe_dt_alias(int inde return ret; } |