aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGovindraj.R <govindraj.raja@ti.com>2011-10-11 05:25:41 -0400
committerKevin Hilman <khilman@ti.com>2011-12-14 19:05:16 -0500
commitedd70ad757e9b336116433e6e62de79ae1dfef54 (patch)
tree4310d4157a6c4fc0a965919f57e834453c06074f /drivers/tty
parent7496ba309f2adbce74d917fbb8bd3da26222d49f (diff)
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/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c10
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)
1275 up->port.ops = &serial_omap_pops; 1275 up->port.ops = &serial_omap_pops;
1276 up->port.line = pdev->id; 1276 up->port.line = pdev->id;
1277 1277
1278 up->port.membase = omap_up_info->membase; 1278 up->port.mapbase = mem->start;
1279 up->port.mapbase = omap_up_info->mapbase; 1279 up->port.membase = ioremap(mem->start, resource_size(mem));
1280 if (!up->port.membase) {
1281 dev_err(&pdev->dev, "can't ioremap UART\n");
1282 ret = -ENOMEM;
1283 goto err;
1284 }
1285
1280 up->port.flags = omap_up_info->flags; 1286 up->port.flags = omap_up_info->flags;
1281 up->port.uartclk = omap_up_info->uartclk; 1287 up->port.uartclk = omap_up_info->uartclk;
1282 up->uart_dma.uart_base = mem->start; 1288 up->uart_dma.uart_base = mem->start;