X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5f33b429e2ec7a5aa0f78cb1d96e22778c6ea5c3..53a9db66e3da4f3d163beb5dc85cd2773c7a2918:/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch?ds=sidebyside

diff --git a/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch
index e41b7e1ad..0b694c3bf 100644
--- a/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/191-cambria_optional_uart.patch
@@ -124,7 +124,7 @@
  	unsigned int		custom_divisor;
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c
-@@ -406,6 +406,20 @@ static void mem_serial_out(struct uart_p
+@@ -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;
-@@ -499,6 +513,11 @@ static void set_io_from_upio(struct uart
+@@ -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;
-@@ -531,6 +550,7 @@ serial_out_sync(struct uart_8250_port *u
+@@ -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
-@@ -2451,6 +2471,7 @@ static int serial8250_request_std_resour
+@@ -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;
  
-@@ -2488,6 +2509,7 @@ static void serial8250_release_std_resou
+@@ -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;
  
-@@ -2960,6 +2982,7 @@ static int __devinit serial8250_probe(st
+@@ -2959,6 +2981,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 @@
  		if (share_irqs)
  			port.irqflags |= IRQF_SHARED;
  		ret = serial8250_register_port(&port);
-@@ -3110,6 +3133,7 @@ int serial8250_register_port(struct uart
+@@ -3109,6 +3132,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;