diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-25 17:32:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-25 17:32:01 +0000 |
| commit | da94b00df54ec23656b4d8a785b1e9af5da1d207 (patch) | |
| tree | 432ebc84d3605aa5190e056ce2e89c8e26efc352 /target/linux/ixp4xx/patches-4.1 | |
| parent | fa4395db04e20e5e50b63cdec8b876e22d7e118f (diff) | |
| download | upstream-da94b00df54ec23656b4d8a785b1e9af5da1d207.tar.gz upstream-da94b00df54ec23656b4d8a785b1e9af5da1d207.tar.bz2 upstream-da94b00df54ec23656b4d8a785b1e9af5da1d207.zip | |
kernel: update kernel 4.1 to version 4.1.11
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.11
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47252
Diffstat (limited to 'target/linux/ixp4xx/patches-4.1')
| -rw-r--r-- | target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch index e44740d6f7..9dc184bf2c 100644 --- a/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.1/160-delayed_uart_io.patch @@ -1,6 +1,6 @@ --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c -@@ -438,6 +438,20 @@ static void mem_serial_out(struct uart_p +@@ -446,6 +446,20 @@ static void mem_serial_out(struct uart_p writeb(value, p->membase + offset); } @@ -21,7 +21,7 @@ static void mem32_serial_out(struct uart_port *p, int offset, int value) { offset = offset << p->regshift; -@@ -505,6 +519,11 @@ static void set_io_from_upio(struct uart +@@ -513,6 +527,11 @@ static void set_io_from_upio(struct uart p->serial_out = mem32be_serial_out; break; @@ -33,7 +33,7 @@ #if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X) case UPIO_AU: p->serial_in = au_serial_in; -@@ -531,6 +550,7 @@ serial_port_out_sync(struct uart_port *p +@@ -539,6 +558,7 @@ serial_port_out_sync(struct uart_port *p case UPIO_MEM: case UPIO_MEM32: case UPIO_MEM32BE: @@ -41,7 +41,7 @@ case UPIO_AU: p->serial_out(p, offset, value); p->serial_in(p, UART_LCR); /* safe, no side-effects */ -@@ -2768,6 +2788,7 @@ static int serial8250_request_std_resour +@@ -2776,6 +2796,7 @@ static int serial8250_request_std_resour case UPIO_MEM32: case UPIO_MEM32BE: case UPIO_MEM: @@ -49,7 +49,7 @@ if (!port->mapbase) break; -@@ -2805,6 +2826,7 @@ static void serial8250_release_std_resou +@@ -2813,6 +2834,7 @@ static void serial8250_release_std_resou case UPIO_MEM32: case UPIO_MEM32BE: case UPIO_MEM: @@ -57,7 +57,7 @@ if (!port->mapbase) break; -@@ -3693,6 +3715,7 @@ static int serial8250_probe(struct platf +@@ -3701,6 +3723,7 @@ static int serial8250_probe(struct platf uart.port.set_termios = p->set_termios; uart.port.pm = p->pm; uart.port.dev = &dev->dev; @@ -65,7 +65,7 @@ uart.port.irqflags |= irqflag; ret = serial8250_register_8250_port(&uart); if (ret < 0) { -@@ -3849,6 +3872,7 @@ int serial8250_register_8250_port(struct +@@ -3857,6 +3880,7 @@ int serial8250_register_8250_port(struct uart->bugs = up->bugs; uart->port.mapbase = up->port.mapbase; uart->port.mapsize = up->port.mapsize; |