diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-03-21 01:14:45 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-21 01:14:45 +0000 |
| commit | 75fb406a221a088aa799b7ce4915bf4369dc0505 (patch) | |
| tree | 22de51a5fd76ff8ba534e6878e6c5692a74a7f42 /packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch | |
| parent | 748de28022afb7e6d35ab98d53660203406ff111 (diff) | |
linux-oz-2.6: Add 2.6.16 kernel (tested on c7x0 and spitz)
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch new file mode 100644 index 0000000000..b3a7f786ea --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch @@ -0,0 +1,73 @@ +Index: linux-2.6.14/drivers/serial/8250.c +=================================================================== +--- linux-2.6.14.orig/drivers/serial/8250.c 2005-11-07 18:10:50.000000000 +0000 ++++ linux-2.6.14/drivers/serial/8250.c 2005-11-07 19:01:21.000000000 +0000 +@@ -2333,7 +2333,12 @@ + .devfs_name = "tts/", + .dev_name = "ttyS", + .major = TTY_MAJOR, ++#ifdef CONFIG_SERIAL_PXA ++ .minor = 64 + 3, ++ .name_base = 3, ++#else + .minor = 64, ++#endif + .nr = UART_NR, + .cons = SERIAL8250_CONSOLE, + }; +Index: linux-2.6.14/drivers/serial/serial_core.c +=================================================================== +--- linux-2.6.14.orig/drivers/serial/serial_core.c 2005-11-07 18:10:50.000000000 +0000 ++++ linux-2.6.14/drivers/serial/serial_core.c 2005-11-07 19:01:21.000000000 +0000 +@@ -2126,6 +2126,7 @@ + normal->driver_name = drv->driver_name; + normal->devfs_name = drv->devfs_name; + normal->name = drv->dev_name; ++ normal->name_base = drv->name_base; + normal->major = drv->major; + normal->minor_start = drv->minor; + normal->type = TTY_DRIVER_TYPE_SERIAL; +Index: linux-2.6.14/include/linux/serial_core.h +=================================================================== +--- linux-2.6.14.orig/include/linux/serial_core.h 2005-11-07 18:10:56.000000000 +0000 ++++ linux-2.6.14/include/linux/serial_core.h 2005-11-07 19:01:21.000000000 +0000 +@@ -322,6 +322,7 @@ + const char *driver_name; + const char *dev_name; + const char *devfs_name; ++ int name_base; + int major; + int minor; + int nr; +Index: linux-2.6.14/drivers/serial/serial_cs.c +=================================================================== +--- linux-2.6.14.orig/drivers/serial/serial_cs.c 2005-10-28 01:02:08.000000000 +0100 ++++ linux-2.6.14/drivers/serial/serial_cs.c 2005-11-07 19:01:21.000000000 +0000 +@@ -294,7 +294,7 @@ + kio_addr_t iobase, int irq) + { + struct uart_port port; +- int line; ++ int line, linestart; + + memset(&port, 0, sizeof (struct uart_port)); + port.iobase = iobase; +@@ -311,10 +311,16 @@ + return -EINVAL; + } + ++#if CONFIG_SERIAL_PXA ++ linestart = 3; ++#else ++ linestart = 0; ++#endif ++ + info->line[info->ndev] = line; +- sprintf(info->node[info->ndev].dev_name, "ttyS%d", line); ++ sprintf(info->node[info->ndev].dev_name, "ttyS%d", line+linestart); + info->node[info->ndev].major = TTY_MAJOR; +- info->node[info->ndev].minor = 0x40 + line; ++ info->node[info->ndev].minor = 0x40 + line + linestart; + if (info->ndev > 0) + info->node[info->ndev - 1].next = &info->node[info->ndev]; + info->ndev++; |