diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-08-04 23:38:04 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-08-04 23:38:04 -0700 |
| commit | c196c1d6cdcccb97a89d61be519db5db5fdad51e (patch) | |
| tree | df94d4fc203d4e576c44216b0c693ab04548d8f7 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 905802fa542d99e1e517d6a9cfbdb24824b3651b (diff) | |
| parent | b13b7246a4b40ab53ec22d33e935d25c8ee8d1fc (diff) | |
| download | olio-linux-3.10-c196c1d6cdcccb97a89d61be519db5db5fdad51e.tar.xz olio-linux-3.10-c196c1d6cdcccb97a89d61be519db5db5fdad51e.zip | |
Merge remote-tracking branch 'olio/mindtribe_dev' into android-3.10-bringup
Change-Id: Ib628ec8c5402bdaec5cc4924f674ba1c38206993
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 06b150f4956..6a6e8b2bd45 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -338,11 +338,11 @@ static struct omap_uart_port_info omap_uart_ports[] = { .dma_rx_buf_size = DEFAULT_RXDMA_BUFSIZE, .dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT, .dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE, - .autosuspend_timeout = 1000, + .autosuspend_timeout = 100, .wakelock_timeout = 150, .wake_peer = bcm_bt_lpm_exit_lpm_locked, .wakeup_capable = true, - .rx_trig = 0x3, + .rx_trig = 32, }, { .dma_enabled = false, /* To specify DMA Mode */ |