mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
ixp4xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22649 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -106,7 +106,7 @@
|
||||
unsigned int type; /* If UPF_FIXED_TYPE */
|
||||
--- a/include/linux/serial_core.h
|
||||
+++ b/include/linux/serial_core.h
|
||||
@@ -288,6 +288,7 @@ struct uart_port {
|
||||
@@ -293,6 +293,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 */
|
||||
@@ -330,6 +331,7 @@ struct uart_port {
|
||||
@@ -335,6 +336,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 @@ static void mem_serial_out(struct uart_p
|
||||
@@ -410,6 +410,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 @@ static void set_io_from_upio(struct uart
|
||||
@@ -503,6 +517,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 @@ 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 @@
|
||||
#ifdef CONFIG_SERIAL_8250_AU1X00
|
||||
case UPIO_AU:
|
||||
#endif
|
||||
@@ -2450,6 +2470,7 @@ static int serial8250_request_std_resour
|
||||
@@ -2460,6 +2480,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 @@ static void serial8250_release_std_resou
|
||||
@@ -2497,6 +2518,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 @@ static int __devinit serial8250_probe(st
|
||||
@@ -2995,6 +3017,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 @@ int serial8250_register_port(struct uart
|
||||
@@ -3144,6 +3167,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;
|
||||
|
||||
Reference in New Issue
Block a user