summaryrefslogtreecommitdiffstats
path: root/meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch')
-rw-r--r--meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch50
1 files changed, 30 insertions, 20 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
index 9ece71331a..bf20f46a05 100644
--- a/meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
@@ -5,28 +5,38 @@
5 include/linux/serial_core.h | 1 + 5 include/linux/serial_core.h | 1 +
6 4 files changed, 16 insertions(+), 3 deletions(-) 6 4 files changed, 16 insertions(+), 3 deletions(-)
7 7
8Index: git/drivers/serial/8250.c 8Index: linux-2.6.20/drivers/serial/8250.c
9=================================================================== 9===================================================================
10--- git.orig/drivers/serial/8250.c 2006-10-31 16:29:50.000000000 +0000 10--- linux-2.6.20.orig/drivers/serial/8250.c 2007-04-27 13:37:26.000000000 +0100
11+++ git/drivers/serial/8250.c 2006-10-31 16:29:53.000000000 +0000 11+++ linux-2.6.20/drivers/serial/8250.c 2007-04-27 13:38:16.000000000 +0100
12@@ -2429,7 +2429,12 @@ static struct uart_driver serial8250_reg 12@@ -2429,7 +2429,12 @@
13 .driver_name = "serial", 13 .driver_name = "serial",
14 .dev_name = "ttyS", 14 .dev_name = "ttyS",
15 .major = TTY_MAJOR, 15 .major = TTY_MAJOR,
16+#ifdef CONFIG_SERIAL_PXA 16+#ifdef CONFIG_SERIAL_PXA
17+ .minor = 64 + 3, 17+ .minor = 64 + 4,
18+ .name_base = 3, 18+ .name_base = 4,
19+#else 19+#else
20 .minor = 64, 20 .minor = 64,
21+#endif 21+#endif
22 .nr = UART_NR, 22 .nr = UART_NR,
23 .cons = SERIAL8250_CONSOLE, 23 .cons = SERIAL8250_CONSOLE,
24 }; 24 };
25Index: git/drivers/serial/serial_core.c 25Index: linux-2.6.20/drivers/serial/serial_core.c
26=================================================================== 26===================================================================
27--- git.orig/drivers/serial/serial_core.c 2006-10-31 16:09:17.000000000 +0000 27--- linux-2.6.20.orig/drivers/serial/serial_core.c 2007-02-04 18:44:54.000000000 +0000
28+++ git/drivers/serial/serial_core.c 2006-10-31 16:29:53.000000000 +0000 28+++ linux-2.6.20/drivers/serial/serial_core.c 2007-04-27 13:39:39.000000000 +0100
29@@ -2183,6 +2183,7 @@ int uart_register_driver(struct uart_dri 29@@ -2068,7 +2068,8 @@
30 printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
31 port->dev ? port->dev->bus_id : "",
32 port->dev ? ": " : "",
33- drv->dev_name, port->line, address, port->irq, uart_type(port));
34+ drv->dev_name, port->line + drv->name_base, address, port->irq,
35+ uart_type(port));
36 }
37
38 static void
39@@ -2183,6 +2184,7 @@
30 normal->owner = drv->owner; 40 normal->owner = drv->owner;
31 normal->driver_name = drv->driver_name; 41 normal->driver_name = drv->driver_name;
32 normal->name = drv->dev_name; 42 normal->name = drv->dev_name;
@@ -34,11 +44,11 @@ Index: git/drivers/serial/serial_core.c
34 normal->major = drv->major; 44 normal->major = drv->major;
35 normal->minor_start = drv->minor; 45 normal->minor_start = drv->minor;
36 normal->type = TTY_DRIVER_TYPE_SERIAL; 46 normal->type = TTY_DRIVER_TYPE_SERIAL;
37Index: git/include/linux/serial_core.h 47Index: linux-2.6.20/include/linux/serial_core.h
38=================================================================== 48===================================================================
39--- git.orig/include/linux/serial_core.h 2006-10-31 16:09:45.000000000 +0000 49--- linux-2.6.20.orig/include/linux/serial_core.h 2007-02-04 18:44:54.000000000 +0000
40+++ git/include/linux/serial_core.h 2006-10-31 16:30:36.000000000 +0000 50+++ linux-2.6.20/include/linux/serial_core.h 2007-04-27 13:37:27.000000000 +0100
41@@ -339,6 +339,7 @@ struct uart_driver { 51@@ -341,6 +341,7 @@
42 struct module *owner; 52 struct module *owner;
43 const char *driver_name; 53 const char *driver_name;
44 const char *dev_name; 54 const char *dev_name;
@@ -46,11 +56,11 @@ Index: git/include/linux/serial_core.h
46 int major; 56 int major;
47 int minor; 57 int minor;
48 int nr; 58 int nr;
49Index: git/drivers/serial/serial_cs.c 59Index: linux-2.6.20/drivers/serial/serial_cs.c
50=================================================================== 60===================================================================
51--- git.orig/drivers/serial/serial_cs.c 2006-10-31 16:09:17.000000000 +0000 61--- linux-2.6.20.orig/drivers/serial/serial_cs.c 2007-02-04 18:44:54.000000000 +0000
52+++ git/drivers/serial/serial_cs.c 2006-10-31 16:29:53.000000000 +0000 62+++ linux-2.6.20/drivers/serial/serial_cs.c 2007-04-27 13:40:34.000000000 +0100
53@@ -390,7 +390,7 @@ static int setup_serial(struct pcmcia_de 63@@ -390,7 +390,7 @@
54 kio_addr_t iobase, int irq) 64 kio_addr_t iobase, int irq)
55 { 65 {
56 struct uart_port port; 66 struct uart_port port;
@@ -59,12 +69,12 @@ Index: git/drivers/serial/serial_cs.c
59 69
60 memset(&port, 0, sizeof (struct uart_port)); 70 memset(&port, 0, sizeof (struct uart_port));
61 port.iobase = iobase; 71 port.iobase = iobase;
62@@ -411,10 +411,16 @@ static int setup_serial(struct pcmcia_de 72@@ -411,10 +411,16 @@
63 return -EINVAL; 73 return -EINVAL;
64 } 74 }
65 75
66+#if CONFIG_SERIAL_PXA 76+#if CONFIG_SERIAL_PXA
67+ linestart = 3; 77+ linestart = 4;
68+#else 78+#else
69+ linestart = 0; 79+ linestart = 0;
70+#endif 80+#endif
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-23 00:53:30 +0000