[adm5120] refresh 2.6.28 patches

[openwrt.git] / target / linux / ar7 / patches-2.6.24 / 500-serial_kludge.patch

diff --git a/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
index 446b2b5..a66bc8a 100644 (file)
--- a/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/serial/8250.c
+Index: linux-2.6.24.7/drivers/serial/8250.c
 ===================================================================
---- linux-2.6.23-rc6.orig/drivers/serial/8250.c        2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/serial/8250.c     2007-09-21 16:24:14.000000000 +0800
-@@ -267,6 +267,13 @@
+--- linux-2.6.24.7.orig/drivers/serial/8250.c
++++ linux-2.6.24.7/drivers/serial/8250.c
+@@ -267,6 +267,13 @@ static const struct serial8250_config ua
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },
@@ -16,7 +16,7 @@ Index: linux-2.6.23-rc6/drivers/serial/8250.c
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2453,7 +2460,11 @@
+@@ -2453,7 +2460,11 @@ static void serial8250_console_putchar(s
  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  
@@ -28,30 +28,17 @@ Index: linux-2.6.23-rc6/drivers/serial/8250.c
        serial_out(up, UART_TX, ch);
  }
  
-Index: linux-2.6.23-rc6/include/linux/serial_core.h
+Index: linux-2.6.24.7/include/linux/serial_core.h
 ===================================================================
---- linux-2.6.23-rc6.orig/include/linux/serial_core.h  2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/serial_core.h       2007-09-21 16:24:14.000000000 +0800
-@@ -40,6 +40,7 @@
+--- linux-2.6.24.7.orig/include/linux/serial_core.h
++++ linux-2.6.24.7/include/linux/serial_core.h
+@@ -40,7 +40,8 @@
  #define PORT_NS16550A 14
  #define PORT_XSCALE   15
  #define PORT_RM9000   16      /* PMC-Sierra RM9xxx internal UART */
-+#define PORT_AR7      16
- #define PORT_MAX_8250 16      /* max port ID */
+-#define PORT_MAX_8250 16      /* max port ID */
++#define PORT_AR7      17
++#define PORT_MAX_8250 17      /* max port ID */
  
  /*
-Index: linux-2.6.23-rc6/include/linux/serialP.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/linux/serialP.h      2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/serialP.h   2007-09-21 16:24:14.000000000 +0800
-@@ -135,6 +135,10 @@
-  * the interrupt line _up_ instead of down, so if we register the IRQ
-  * while the UART is in that state, we die in an IRQ storm. */
- #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
-+#elif defined(CONFIG_AR7)
-+/* This is how it is set up by bootloader... */
-+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
-+                      | UART_MCR_RTS | UART_MCR_DTR)
- #else
- #define ALPHA_KLUDGE_MCR 0
- #endif
+  * ARM specific type numbers.  These are not currently guaranteed