aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorGovindraj.R <govindraj.raja@ti.com>2012-04-03 09:42:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-18 18:07:05 -0400
commit7c77c8decfd14a611ddcba071782a9520e4bb3f8 (patch)
treed9f1925bb2a91687d54fcae0724be8dd4e5850ac /arch/arm
parent4fd0690bb0c3955983560bb2767ee82e2b197f9b (diff)
OMAP2+: UART: Remove cpu checks for populating errata flags
Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself. Cc: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Reviewed-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/serial.c8
-rw-r--r--arch/arm/plat-omap/include/plat/omap-serial.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 0cdd359a128e..6affdd4bee62 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -355,14 +355,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
355 omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate; 355 omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
356 omap_up.autosuspend_timeout = info->autosuspend_timeout; 356 omap_up.autosuspend_timeout = info->autosuspend_timeout;
357 357
358 /* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
359 if (!cpu_is_omap2420() && !cpu_is_ti816x())
360 omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
361
362 /* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
363 if (cpu_is_omap34xx() || cpu_is_omap3630())
364 omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
365
366 pdata = &omap_up; 358 pdata = &omap_up;
367 pdata_size = sizeof(struct omap_uart_port_info); 359 pdata_size = sizeof(struct omap_uart_port_info);
368 360
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 9ff444469f3d..1a52725ffcf2 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
65 bool dma_enabled; /* To specify DMA Mode */ 65 bool dma_enabled; /* To specify DMA Mode */
66 unsigned int uartclk; /* UART clock rate */ 66 unsigned int uartclk; /* UART clock rate */
67 upf_t flags; /* UPF_* flags */ 67 upf_t flags; /* UPF_* flags */
68 u32 errata;
69 unsigned int dma_rx_buf_size; 68 unsigned int dma_rx_buf_size;
70 unsigned int dma_rx_timeout; 69 unsigned int dma_rx_timeout;
71 unsigned int autosuspend_timeout; 70 unsigned int autosuspend_timeout;