diff options
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap-serial.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap-serial.h | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 1a52725ffcf..a531149823b 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #define __OMAP_SERIAL_H__ | 18 | #define __OMAP_SERIAL_H__ |
19 | 19 | ||
20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/device.h> |
22 | #include <linux/pm_qos.h> | 22 | #include <linux/pm_qos.h> |
23 | 23 | ||
24 | #include <plat/mux.h> | 24 | #include <plat/mux.h> |
@@ -42,10 +42,10 @@ | |||
42 | #define OMAP_UART_WER_MOD_WKUP 0X7F | 42 | #define OMAP_UART_WER_MOD_WKUP 0X7F |
43 | 43 | ||
44 | /* Enable XON/XOFF flow control on output */ | 44 | /* Enable XON/XOFF flow control on output */ |
45 | #define OMAP_UART_SW_TX 0x04 | 45 | #define OMAP_UART_SW_TX 0x8 |
46 | 46 | ||
47 | /* Enable XON/XOFF flow control on input */ | 47 | /* Enable XON/XOFF flow control on input */ |
48 | #define OMAP_UART_SW_RX 0x04 | 48 | #define OMAP_UART_SW_RX 0x2 |
49 | 49 | ||
50 | #define OMAP_UART_SYSC_RESET 0X07 | 50 | #define OMAP_UART_SYSC_RESET 0X07 |
51 | #define OMAP_UART_TCR_TRIG 0X0F | 51 | #define OMAP_UART_TCR_TRIG 0X0F |
@@ -69,11 +69,14 @@ struct omap_uart_port_info { | |||
69 | unsigned int dma_rx_timeout; | 69 | unsigned int dma_rx_timeout; |
70 | unsigned int autosuspend_timeout; | 70 | unsigned int autosuspend_timeout; |
71 | unsigned int dma_rx_poll_rate; | 71 | unsigned int dma_rx_poll_rate; |
72 | int DTR_gpio; | ||
73 | int DTR_inverted; | ||
74 | int DTR_present; | ||
72 | 75 | ||
73 | int (*get_context_loss_count)(struct device *); | 76 | int (*get_context_loss_count)(struct device *); |
74 | void (*set_forceidle)(struct platform_device *); | 77 | void (*set_forceidle)(struct device *); |
75 | void (*set_noidle)(struct platform_device *); | 78 | void (*set_noidle)(struct device *); |
76 | void (*enable_wakeup)(struct platform_device *, bool); | 79 | void (*enable_wakeup)(struct device *, bool); |
77 | }; | 80 | }; |
78 | 81 | ||
79 | struct uart_omap_dma { | 82 | struct uart_omap_dma { |
@@ -102,39 +105,4 @@ struct uart_omap_dma { | |||
102 | unsigned int rx_timeout; | 105 | unsigned int rx_timeout; |
103 | }; | 106 | }; |
104 | 107 | ||
105 | struct uart_omap_port { | ||
106 | struct uart_port port; | ||
107 | struct uart_omap_dma uart_dma; | ||
108 | struct platform_device *pdev; | ||
109 | |||
110 | unsigned char ier; | ||
111 | unsigned char lcr; | ||
112 | unsigned char mcr; | ||
113 | unsigned char fcr; | ||
114 | unsigned char efr; | ||
115 | unsigned char dll; | ||
116 | unsigned char dlh; | ||
117 | unsigned char mdr1; | ||
118 | unsigned char scr; | ||
119 | |||
120 | int use_dma; | ||
121 | /* | ||
122 | * Some bits in registers are cleared on a read, so they must | ||
123 | * be saved whenever the register is read but the bits will not | ||
124 | * be immediately processed. | ||
125 | */ | ||
126 | unsigned int lsr_break_flag; | ||
127 | unsigned char msr_saved_flags; | ||
128 | char name[20]; | ||
129 | unsigned long port_activity; | ||
130 | u32 context_loss_cnt; | ||
131 | u32 errata; | ||
132 | u8 wakeups_enabled; | ||
133 | |||
134 | struct pm_qos_request pm_qos_request; | ||
135 | u32 latency; | ||
136 | u32 calc_latency; | ||
137 | struct work_struct qos_work; | ||
138 | }; | ||
139 | |||
140 | #endif /* __OMAP_SERIAL_H__ */ | 108 | #endif /* __OMAP_SERIAL_H__ */ |