diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-26 06:23:32 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-02-26 06:23:32 +0000 |
| commit | a754c302a8a3533f692258c831dec7e48105aa01 (patch) | |
| tree | f18d4db2e3dfa5e42dd0e91462d665efad563633 /target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch | |
| parent | b1384cb5d4e9b184e96eaf03023a8f0e46e640fc (diff) | |
ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board support patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch index 099980b80..603cf3cc6 100644 --- a/target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch @@ -124,7 +124,7 @@ unsigned int custom_divisor; --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c -@@ -412,6 +412,20 @@ static void mem_serial_out(struct uart_p +@@ -413,6 +413,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; -@@ -503,6 +517,11 @@ static void set_io_from_upio(struct uart +@@ -504,6 +518,11 @@ static void set_io_from_upio(struct uart p->serial_out = mem32_serial_out; break; @@ -157,7 +157,7 @@ case UPIO_AU: p->serial_in = au_serial_in; p->serial_out = au_serial_out; -@@ -534,6 +553,7 @@ serial_out_sync(struct uart_8250_port *u +@@ -535,6 +554,7 @@ serial_out_sync(struct uart_8250_port *u switch (p->iotype) { case UPIO_MEM: case UPIO_MEM32: @@ -165,7 +165,7 @@ case UPIO_AU: case UPIO_DWAPB: p->serial_out(p, offset, value); -@@ -2476,6 +2496,7 @@ static int serial8250_request_std_resour +@@ -2477,6 +2497,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; -@@ -2513,6 +2534,7 @@ static void serial8250_release_std_resou +@@ -2514,6 +2535,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; -@@ -3024,6 +3046,7 @@ static int __devinit serial8250_probe(st +@@ -3025,6 +3047,7 @@ static int __devinit serial8250_probe(st port.set_termios = p->set_termios; port.pm = p->pm; port.dev = &dev->dev; @@ -189,7 +189,7 @@ port.irqflags |= irqflag; ret = serial8250_register_port(&port); if (ret < 0) { -@@ -3173,6 +3196,7 @@ int serial8250_register_port(struct uart +@@ -3174,6 +3197,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 -@@ -2130,6 +2130,7 @@ uart_report_port(struct uart_driver *drv +@@ -2129,6 +2129,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: -@@ -2550,6 +2551,7 @@ int uart_match_port(struct uart_port *po +@@ -2549,6 +2550,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |