diff options
author | Govindraj.R <govindraj.raja@ti.com> | 2011-10-11 05:25:41 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-12-14 19:05:16 -0500 |
commit | edd70ad757e9b336116433e6e62de79ae1dfef54 (patch) | |
tree | 4310d4157a6c4fc0a965919f57e834453c06074f /arch | |
parent | 7496ba309f2adbce74d917fbb8bd3da26222d49f (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 'arch')
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap-serial.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 77feaab78059..2456cfdad78c 100644 --- 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) | |||
605 | 605 | ||
606 | omap_up.dma_enabled = uart->dma_enabled; | 606 | omap_up.dma_enabled = uart->dma_enabled; |
607 | omap_up.uartclk = OMAP24XX_BASE_BAUD * 16; | 607 | omap_up.uartclk = OMAP24XX_BASE_BAUD * 16; |
608 | omap_up.mapbase = oh->slaves[0]->addr->pa_start; | ||
609 | omap_up.membase = omap_hwmod_get_mpu_rt_va(oh); | ||
610 | omap_up.flags = UPF_BOOT_AUTOCONF; | 608 | omap_up.flags = UPF_BOOT_AUTOCONF; |
611 | 609 | ||
612 | pdata = &omap_up; | 610 | 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 307cd6f15822..db9bda978767 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h | |||
@@ -59,8 +59,6 @@ | |||
59 | struct omap_uart_port_info { | 59 | struct omap_uart_port_info { |
60 | bool dma_enabled; /* To specify DMA Mode */ | 60 | bool dma_enabled; /* To specify DMA Mode */ |
61 | unsigned int uartclk; /* UART clock rate */ | 61 | unsigned int uartclk; /* UART clock rate */ |
62 | void __iomem *membase; /* ioremap cookie or NULL */ | ||
63 | resource_size_t mapbase; /* resource base */ | ||
64 | upf_t flags; /* UPF_* flags */ | 62 | upf_t flags; /* UPF_* flags */ |
65 | }; | 63 | }; |
66 | 64 | ||