diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-04-22 07:12:09 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-04-22 07:12:09 +0000 |
commit | a0a67ed36661e2252b635e8eb2e2debaa7f2c791 (patch) | |
tree | 0c7e52610b4ffe5971af3fcc7e40d0bb8197cd73 /target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch | |
parent | 934a7884541a41513d9b168fa342ba2d8295b001 (diff) | |
download | master-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.gz master-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.bz2 master-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.zip |
kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21081 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch index 41058e2c8c..2ebe3e4e3e 100644 --- a/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch @@ -106,7 +106,7 @@ unsigned int type; /* If UPF_FIXED_TYPE */ --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h -@@ -285,6 +285,7 @@ struct uart_port { +@@ -288,6 +288,7 @@ struct uart_port { #define UPIO_TSI (5) /* Tsi108/109 type IO */ #define UPIO_DWAPB (6) /* DesignWare APB UART */ #define UPIO_RM9000 (7) /* RM9000 type IO */ @@ -114,7 +114,7 @@ unsigned int read_status_mask; /* driver specific */ unsigned int ignore_status_mask; /* driver specific */ -@@ -327,6 +328,7 @@ struct uart_port { +@@ -330,6 +331,7 @@ struct uart_port { unsigned int mctrl; /* current modem ctrl settings */ unsigned int timeout; /* character-based timeout */ @@ -124,7 +124,7 @@ unsigned int custom_divisor; --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c -@@ -409,6 +409,20 @@ +@@ -409,6 +409,20 @@ static void mem_serial_out(struct uart_p writeb(value, p->membase + offset); } @@ -145,7 +145,7 @@ static void mem32_serial_out(struct uart_port *p, int offset, int value) { offset = map_8250_out_reg(p, offset) << p->regshift; -@@ -502,6 +516,11 @@ +@@ -502,6 +516,11 @@ static void set_io_from_upio(struct uart p->serial_out = mem32_serial_out; break; @@ -157,7 +157,7 @@ #ifdef CONFIG_SERIAL_8250_AU1X00 case UPIO_AU: p->serial_in = au_serial_in; -@@ -534,6 +553,7 @@ +@@ -534,6 +553,7 @@ serial_out_sync(struct uart_8250_port *u switch (p->iotype) { case UPIO_MEM: case UPIO_MEM32: @@ -165,7 +165,7 @@ #ifdef CONFIG_SERIAL_8250_AU1X00 case UPIO_AU: #endif -@@ -2450,6 +2470,7 @@ +@@ -2450,6 +2470,7 @@ static int serial8250_request_std_resour case UPIO_MEM32: case UPIO_MEM: case UPIO_DWAPB: @@ -173,7 +173,7 @@ if (!up->port.mapbase) break; -@@ -2487,6 +2508,7 @@ +@@ -2487,6 +2508,7 @@ static void serial8250_release_std_resou case UPIO_MEM32: case UPIO_MEM: case UPIO_DWAPB: @@ -181,7 +181,7 @@ if (!up->port.mapbase) break; -@@ -2964,6 +2986,7 @@ +@@ -2964,6 +2986,7 @@ static int __devinit serial8250_probe(st port.serial_in = p->serial_in; port.serial_out = p->serial_out; port.dev = &dev->dev; @@ -189,7 +189,7 @@ port.irqflags |= irqflag; ret = serial8250_register_port(&port); if (ret < 0) { -@@ -3113,6 +3136,7 @@ +@@ -3113,6 +3136,7 @@ int serial8250_register_port(struct uart uart->port.iotype = port->iotype; uart->port.flags = port->flags | UPF_BOOT_AUTOCONF; uart->port.mapbase = port->mapbase; @@ -199,7 +199,7 @@ uart->port.dev = port->dev; --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c -@@ -2161,6 +2161,7 @@ uart_report_port(struct uart_driver *drv +@@ -2144,6 +2144,7 @@ uart_report_port(struct uart_driver *drv snprintf(address, sizeof(address), "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); break; @@ -207,7 +207,7 @@ case UPIO_MEM: case UPIO_MEM32: case UPIO_AU: -@@ -2573,6 +2574,7 @@ int uart_match_port(struct uart_port *po +@@ -2557,6 +2558,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |