Commit 6b5756f1 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Greg Kroah-Hartman

altera_uart: Add support for getting mapbase and IRQ from resources

This makes it much easier to integrate the driver with the rest of
the Linux (e.g. MFD subsystem).

The old method is still supported though.

Also, from now on, there is one platform device per port (no
changes are needed for the platform code, as no one registers
the devices anywhere in-tree yet).
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Cc: Alan Cox <alan@linux.intel.com>,
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f8b9c15
...@@ -498,38 +498,54 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) ...@@ -498,38 +498,54 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
{ {
struct altera_uart_platform_uart *platp = pdev->dev.platform_data; struct altera_uart_platform_uart *platp = pdev->dev.platform_data;
struct uart_port *port; struct uart_port *port;
int i; struct resource *res_mem;
struct resource *res_irq;
int i = pdev->id;
for (i = 0; i < CONFIG_SERIAL_ALTERA_UART_MAXPORTS && platp[i].mapbase; i++) { /* -1 emphasizes that the platform must have one port, no .N suffix */
port = &altera_uart_ports[i].port; if (i == -1)
i = 0;
port->line = i; if (i >= CONFIG_SERIAL_ALTERA_UART_MAXPORTS)
port->type = PORT_ALTERA_UART; return -EINVAL;
port->mapbase = platp[i].mapbase;
port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
port->iotype = SERIAL_IO_MEM;
port->irq = platp[i].irq;
port->uartclk = platp[i].uartclk;
port->ops = &altera_uart_ops;
port->flags = ASYNC_BOOT_AUTOCONF;
uart_add_one_port(&altera_uart_driver, port); port = &altera_uart_ports[i].port;
}
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res_mem)
port->mapbase = res_mem->start;
else if (platp->mapbase)
port->mapbase = platp->mapbase;
else
return -EINVAL;
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res_irq)
port->irq = res_irq->start;
else if (platp->irq)
port->irq = platp->irq;
port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
if (!port->membase)
return -ENOMEM;
port->line = i;
port->type = PORT_ALTERA_UART;
port->iotype = SERIAL_IO_MEM;
port->uartclk = platp->uartclk;
port->ops = &altera_uart_ops;
port->flags = ASYNC_BOOT_AUTOCONF;
uart_add_one_port(&altera_uart_driver, port);
return 0; return 0;
} }
static int __devexit altera_uart_remove(struct platform_device *pdev) static int __devexit altera_uart_remove(struct platform_device *pdev)
{ {
struct uart_port *port; struct uart_port *port = &altera_uart_ports[pdev->id].port;
int i;
for (i = 0; i < CONFIG_SERIAL_ALTERA_UART_MAXPORTS; i++) {
port = &altera_uart_ports[i].port;
if (port)
uart_remove_one_port(&altera_uart_driver, port);
}
uart_remove_one_port(&altera_uart_driver, port);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment