aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include
diff options
context:
space:
mode:
authorGovindraj.R <govindraj.raja@ti.com>2011-11-07 08:30:33 -0500
committerKevin Hilman <khilman@ti.com>2011-12-14 19:05:22 -0500
commit94734749af794c080f6af6ac3ce8c1c13ee2dbbd (patch)
treefca071b796416579b42860980cd7324ac128d22e /arch/arm/plat-omap/include
parentec3bebc6ec64aac23500e6b8ef5c0aaaeda735cf (diff)
ARM: OMAP2+: UART: Move errata handling from serial.c to omap-serial
Move the errata handling mechanism from serial.c to omap-serial file and utilise the same func in driver file. Errata i202, i291 are moved to be handled with omap-serial Moving the errata macro from serial.c file to driver header file as from on errata will be handled in driver file itself. Corrected errata id from chapter reference 2.15 to errata id i291. Removed errata and dma_enabled fields from omap_uart_state struct as they are no more needed with errata handling done within omap-serial. Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Acked-by: Alan Cox <alan@linux.intel.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/plat-omap/include')
-rw-r--r--arch/arm/plat-omap/include/plat/omap-serial.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 348c9ead6ed..842b429cfea 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -58,12 +58,18 @@
58 58
59#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA 59#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
60 60
61#define UART_ERRATA_i202_MDR1_ACCESS BIT(0)
62#define UART_ERRATA_i291_DMA_FORCEIDLE BIT(1)
63
61struct omap_uart_port_info { 64struct omap_uart_port_info {
62 bool dma_enabled; /* To specify DMA Mode */ 65 bool dma_enabled; /* To specify DMA Mode */
63 unsigned int uartclk; /* UART clock rate */ 66 unsigned int uartclk; /* UART clock rate */
64 upf_t flags; /* UPF_* flags */ 67 upf_t flags; /* UPF_* flags */
68 u32 errata;
65 69
66 int (*get_context_loss_count)(struct device *); 70 int (*get_context_loss_count)(struct device *);
71 void (*set_forceidle)(struct platform_device *);
72 void (*set_noidle)(struct platform_device *);
67}; 73};
68 74
69struct uart_omap_dma { 75struct uart_omap_dma {
@@ -117,6 +123,7 @@ struct uart_omap_port {
117 char name[20]; 123 char name[20];
118 unsigned long port_activity; 124 unsigned long port_activity;
119 u32 context_loss_cnt; 125 u32 context_loss_cnt;
126 u32 errata;
120}; 127};
121 128
122#endif /* __OMAP_SERIAL_H__ */ 129#endif /* __OMAP_SERIAL_H__ */