aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250.c
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2009-01-02 08:49:54 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 13:19:43 -0500
commit8e23fcc89c8091790903927449f8efb9b4e23960 (patch)
treea6f60b457be02430a55629729451ba12288554c0 /drivers/serial/8250.c
parent7d6a07d123b62bf4fa71867420c23da3ca36c995 (diff)
Serial: Allow port type to be specified when calling serial8250_register_port.
Add flag value UPF_FIXED_TYPE which specifies that the UART type is known and should not be probed. For this case the UARTs properties are just copied out of the uart_config entry. This allows us to keep SOC specific 8250 probe code out of 8250.c. In this case we know the serial hardware will not be changing as it is on the same silicon as the CPU, and we can specify it with certainty in the board/cpu setup code. The alternative is to load up 8250.c with a bunch of OCTEON specific special cases in the probing code. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial/8250.c')
-rw-r--r--drivers/serial/8250.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 849af9d21fe..3ae497422db 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2903,6 +2903,7 @@ static int __devinit serial8250_probe(struct platform_device *dev)
2903 port.mapbase = p->mapbase; 2903 port.mapbase = p->mapbase;
2904 port.hub6 = p->hub6; 2904 port.hub6 = p->hub6;
2905 port.private_data = p->private_data; 2905 port.private_data = p->private_data;
2906 port.type = p->type;
2906 port.serial_in = p->serial_in; 2907 port.serial_in = p->serial_in;
2907 port.serial_out = p->serial_out; 2908 port.serial_out = p->serial_out;
2908 port.dev = &dev->dev; 2909 port.dev = &dev->dev;
@@ -3058,6 +3059,14 @@ int serial8250_register_port(struct uart_port *port)
3058 uart->port.private_data = port->private_data; 3059 uart->port.private_data = port->private_data;
3059 if (port->dev) 3060 if (port->dev)
3060 uart->port.dev = port->dev; 3061 uart->port.dev = port->dev;
3062
3063 if (port->flags & UPF_FIXED_TYPE) {
3064 uart->port.type = port->type;
3065 uart->port.fifosize = uart_config[port->type].fifo_size;
3066 uart->capabilities = uart_config[port->type].flags;
3067 uart->tx_loadsz = uart_config[port->type].tx_loadsz;
3068 }
3069
3061 set_io_from_upio(&uart->port); 3070 set_io_from_upio(&uart->port);
3062 /* Possibly override default I/O functions. */ 3071 /* Possibly override default I/O functions. */
3063 if (port->serial_in) 3072 if (port->serial_in)