diff options
| author | Govindraj.R <govindraj.raja@ti.com> | 2011-10-11 11:25:41 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-12-15 01:05:16 +0100 |
| commit | edd70ad757e9b336116433e6e62de79ae1dfef54 (patch) | |
| tree | 4310d4157a6c4fc0a965919f57e834453c06074f /drivers | |
| parent | ARM: OMAP2+: UART: Add default mux for all uarts. (diff) | |
| download | linux-edd70ad757e9b336116433e6e62de79ae1dfef54.tar.xz linux-edd70ad757e9b336116433e6e62de79ae1dfef54.zip | |
ARM: OMAP2+: UART: Remove mapbase/membase fields from pdata.
The mapbase (start_address), membase(io_remap cookie) part of
pdata struct omap_uart_port_info are removed as this should be
derived within driver.
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de> (for drivers/tty changes)
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index be368cf70f3c..31f0cbf73c18 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1275,8 +1275,14 @@ static int serial_omap_probe(struct platform_device *pdev) up->port.ops = &serial_omap_pops; up->port.line = pdev->id; - up->port.membase = omap_up_info->membase; - up->port.mapbase = omap_up_info->mapbase; + up->port.mapbase = mem->start; + up->port.membase = ioremap(mem->start, resource_size(mem)); + if (!up->port.membase) { + dev_err(&pdev->dev, "can't ioremap UART\n"); + ret = -ENOMEM; + goto err; + } + up->port.flags = omap_up_info->flags; up->port.uartclk = omap_up_info->uartclk; up->uart_dma.uart_base = mem->start; |