summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-omap3h1.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index c2f3feac561..c1009f3b7e2 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -319,8 +319,12 @@ static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = {
.dma_rx_buf_size = DEFAULT_RXDMA_BUFSIZE,
.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
.dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT,
+ This one sets runtime pm autosuspend timeout - -1 disables runtime
+ pm (that is, pm that's done while running, not sleeping).
.autosuspend_timeout = DEFAULT_AUTOSUSPEND_DELAY, ( -1 or X ms. )
+ Wakelock timeout: If there's an interrupt on the serial port, this is
+ how long we expect to wait before the system is functional.
.wakelock_timeout - for minnow, this is 150 (BT) or 50 (M4 debug).
Can be left out.
@@ -333,6 +337,8 @@ static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = {
bool open_close_pm; - Minnow uses this for c55 only
unsigned int rx_trig; Minnow, BT & debug only
+
+ The flags field is not used (it's hardcoded in omap_serial_init_port).
*/
static struct omap_uart_port_info omap_uart_ports[] = {
@@ -346,6 +352,12 @@ static struct omap_uart_port_info omap_uart_ports[] = {
.wake_peer = bcm_bt_lpm_exit_lpm_locked,
.wakeup_capable = true,
.rx_trig = 32,
+
+ /* OLIO: make sure RTS isn't enabled before we're ready */
+
+ .rts_wait = true,
+ .rts_enable_fn = rts_exit_sleep_mode,
+ .rts_disable_fn = rts_enter_sleep_mode,
},
{
.dma_enabled = false, /* To specify DMA Mode */
@@ -354,6 +366,9 @@ static struct omap_uart_port_info omap_uart_ports[] = {
.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
.autosuspend_timeout = 0,
.wakeup_capable = false,
+ .rts_wait = false,
+ .rts_enable_fn = NULL,
+ .rts_disable_fn = NULL,
},
{
.dma_enabled = false, /* To specify DMA Mode */
@@ -362,6 +377,9 @@ static struct omap_uart_port_info omap_uart_ports[] = {
.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
.autosuspend_timeout = -1,
.wakeup_capable = true,
+ .rts_wait = false,
+ .rts_enable_fn = NULL,
+ .rts_disable_fn = NULL,
},
{
.dma_enabled = false, /* To specify DMA Mode */
@@ -370,6 +388,9 @@ static struct omap_uart_port_info omap_uart_ports[] = {
.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
.autosuspend_timeout = 0,
.wakeup_capable = false,
+ .rts_wait = false,
+ .rts_enable_fn = NULL,
+ .rts_disable_fn = NULL,
},
};