aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 11:21:12 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 13:47:13 +0200
commit7a9afb8783d60e16308f98efb59907aec0fdd5f7 (patch)
tree9a267851e63367c06bee9c3ca9012c8b9b709ca0 /target/linux/ixp4xx
parent3b1ea0996f83690695e06d11e0214110b6f7201f (diff)
downloadupstream-7a9afb8783d60e16308f98efb59907aec0fdd5f7.tar.gz
upstream-7a9afb8783d60e16308f98efb59907aec0fdd5f7.tar.bz2
upstream-7a9afb8783d60e16308f98efb59907aec0fdd5f7.zip
kernel: bump 4.9 to 4.9.123
Refreshed all patches Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
index 40e830dbcb..c510e42bb6 100644
--- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
+++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
@@ -64,7 +64,7 @@
unsigned int custom_divisor;
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
-@@ -384,6 +384,20 @@ static unsigned int mem16_serial_in(stru
+@@ -383,6 +383,20 @@ static unsigned int mem16_serial_in(stru
return readw(p->membase + offset);
}
@@ -85,7 +85,7 @@
static void mem32_serial_out(struct uart_port *p, int offset, int value)
{
offset = offset << p->regshift;
-@@ -456,6 +470,11 @@ static void set_io_from_upio(struct uart
+@@ -455,6 +469,11 @@ static void set_io_from_upio(struct uart
p->serial_out = mem32be_serial_out;
break;
@@ -97,7 +97,7 @@
#ifdef CONFIG_SERIAL_8250_RT288X
case UPIO_AU:
p->serial_in = au_serial_in;
-@@ -483,6 +502,7 @@ serial_port_out_sync(struct uart_port *p
+@@ -482,6 +501,7 @@ serial_port_out_sync(struct uart_port *p
case UPIO_MEM16:
case UPIO_MEM32:
case UPIO_MEM32BE:
@@ -105,7 +105,7 @@
case UPIO_AU:
p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */
-@@ -2760,6 +2780,7 @@ static int serial8250_request_std_resour
+@@ -2759,6 +2779,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM:
@@ -113,7 +113,7 @@
if (!port->mapbase)
break;
-@@ -2798,6 +2819,7 @@ static void serial8250_release_std_resou
+@@ -2797,6 +2818,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM: