ar71xx: enable myloader partition parser on 2.6.30 and 2.6.31

[openwrt.git] / target / linux / ixp4xx / patches-2.6.30 / 191-cambria_optional_uart.patch

diff --git a/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch
index 3ffe715..f4ce53a 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.30/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.30/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
        unsigned int    type;           /* If UPF_FIXED_TYPE */
 --- a/include/linux/serial_core.h
 +++ b/include/linux/serial_core.h

-@@ -270,6 +270,7 @@ struct uart_port {
+@@ -273,6 +273,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 */
  #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 */
  
        unsigned int            read_status_mask;       /* driver specific */
        unsigned int            ignore_status_mask;     /* driver specific */

-@@ -312,6 +313,7 @@ struct uart_port {
+@@ -315,6 +316,7 @@ struct uart_port {

  
        unsigned int            mctrl;                  /* current modem ctrl settings */
        unsigned int            timeout;                /* character-based timeout */
  
        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
        unsigned int            custom_divisor;
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c

-@@ -396,6 +396,20 @@ static void mem_serial_out(struct uart_p
+@@ -397,6 +397,20 @@ static void mem_serial_out(struct uart_p

        writeb(value, p->membase + offset);
  }
  
        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;
  static void mem32_serial_out(struct uart_port *p, int offset, int value)
  {
        offset = map_8250_out_reg(p, offset) << p->regshift;

-@@ -488,6 +502,11 @@ static void set_io_from_upio(struct uart
+@@ -490,6 +504,11 @@ static void set_io_from_upio(struct uart

                p->serial_out = mem32_serial_out;
                break;
  
                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;
  #ifdef CONFIG_SERIAL_8250_AU1X00
        case UPIO_AU:
                p->serial_in = au_serial_in;

-@@ -518,6 +537,7 @@ serial_out_sync(struct uart_8250_port *u
+@@ -522,6 +541,7 @@ serial_out_sync(struct uart_8250_port *u

        switch (p->iotype) {
        case UPIO_MEM:
        case UPIO_MEM32:
        switch (p->iotype) {
        case UPIO_MEM:
        case UPIO_MEM32:


@@ -165,7 +165,7 @@
  #ifdef CONFIG_SERIAL_8250_AU1X00
        case UPIO_AU:
  #endif
  #ifdef CONFIG_SERIAL_8250_AU1X00
        case UPIO_AU:
  #endif

-@@ -2433,6 +2453,7 @@ static int serial8250_request_std_resour
+@@ -2440,6 +2460,7 @@ static int serial8250_request_std_resour

        case UPIO_MEM32:
        case UPIO_MEM:
        case UPIO_DWAPB:
        case UPIO_MEM32:
        case UPIO_MEM:
        case UPIO_DWAPB:


@@ -173,7 +173,7 @@
                if (!up->port.mapbase)
                        break;
  
                if (!up->port.mapbase)
                        break;
  

-@@ -2470,6 +2491,7 @@ static void serial8250_release_std_resou
+@@ -2477,6 +2498,7 @@ static void serial8250_release_std_resou

        case UPIO_MEM32:
        case UPIO_MEM:
        case UPIO_DWAPB:
        case UPIO_MEM32:
        case UPIO_MEM:
        case UPIO_DWAPB:


@@ -181,7 +181,7 @@
                if (!up->port.mapbase)
                        break;
  
                if (!up->port.mapbase)
                        break;
  

-@@ -2931,6 +2953,7 @@ static int __devinit serial8250_probe(st
+@@ -2946,6 +2968,7 @@ static int __devinit serial8250_probe(st

                port.serial_in          = p->serial_in;
                port.serial_out         = p->serial_out;
                port.dev                = &dev->dev;
                port.serial_in          = p->serial_in;
                port.serial_out         = p->serial_out;
                port.dev                = &dev->dev;


@@ -189,7 +189,7 @@
                if (share_irqs)
                        port.flags |= UPF_SHARE_IRQ;
                ret = serial8250_register_port(&port);
                if (share_irqs)
                        port.flags |= UPF_SHARE_IRQ;
                ret = serial8250_register_port(&port);

-@@ -3080,6 +3103,7 @@ int serial8250_register_port(struct uart
+@@ -3095,6 +3118,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;
                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
                        uart->port.dev = port->dev;
 --- a/drivers/serial/serial_core.c
 +++ b/drivers/serial/serial_core.c

-@@ -2142,6 +2142,7 @@ uart_report_port(struct uart_driver *drv
+@@ -2138,6 +2138,7 @@ uart_report_port(struct uart_driver *drv

                snprintf(address, sizeof(address),
                         "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
                break;
                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:
        case UPIO_MEM:
        case UPIO_MEM32:
        case UPIO_AU:

-@@ -2556,6 +2557,7 @@ int uart_match_port(struct uart_port *po
+@@ -2552,6 +2553,7 @@ int uart_match_port(struct uart_port *po

        case UPIO_HUB6:
                return (port1->iobase == port2->iobase) &&
                       (port1->hub6   == port2->hub6);
        case UPIO_HUB6:
                return (port1->iobase == port2->iobase) &&
                       (port1->hub6   == port2->hub6);