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>

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 77feaab78059540fa418c1782ff23c41cf899da7..2456cfdad78cb775d7d6d667f2ac0c224358986a 100644 (file)
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -605,8 +605,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
 
        omap_up.dma_enabled = uart->dma_enabled;
        omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
-       omap_up.mapbase = oh->slaves[0]->addr->pa_start;
-       omap_up.membase = omap_hwmod_get_mpu_rt_va(oh);
        omap_up.flags = UPF_BOOT_AUTOCONF;
 
        pdata = &omap_up;

diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 307cd6f15822069744bf7bff637002b3453b9e5c..db9bda978767601294162c2ed403a62a7eefa4a2 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -59,8 +59,6 @@
 struct omap_uart_port_info {
        bool                    dma_enabled;    /* To specify DMA Mode */
        unsigned int            uartclk;        /* UART clock rate */
-       void __iomem            *membase;       /* ioremap cookie or NULL */
-       resource_size_t         mapbase;        /* resource base */
        upf_t                   flags;          /* UPF_* flags */
 };
 

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index be368cf70f3c2cedf979f4df764a04958926eaa2..31f0cbf73c18fbeee378d4a8499541061da24cf3 100644 (file)
--- 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;