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 | |
| 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')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1-bluetooth.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c index b3cb230e16b..a56ae4e4bd5 100644 --- a/arch/arm/mach-omap2/board-omap3h1-bluetooth.c +++ b/arch/arm/mach-omap2/board-omap3h1-bluetooth.c @@ -47,7 +47,7 @@ static void set_host_wake_locked(int); #define BT_REG_GPIO 180 #define BT_WAKE_GPIO 93 #define BT_HOST_WAKE_GPIO 11 -#define UART_PORT 1 +#define UART_PORT 0 /* UART 1 = 0 */ #define olio_debug(format, ...) printk ("OLIO %s: ", __FUNCTION__); printk (format, ##__VA_ARGS__) @@ -122,8 +122,13 @@ static void set_wake_locked(int wake) if (wake) { olio_debug ("Now locking wake lock\n"); wake_lock (&bt_lpm.bcm_wake_lock); + + /* Does this even make sense here? We've already using the port, + doesn't that mean that we're */ + + if (!wake_uart_enabled) - omap_serial_ext_uart_enable(UART_PORT); + omap_serial_ext_uart_enable(UART_PORT); } gpio_set_value(BT_WAKE_GPIO, wake); @@ -131,7 +136,7 @@ static void set_wake_locked(int wake) /* Let UART know we're done with it */ if (wake_uart_enabled && !wake) - omap_serial_ext_uart_disable(UART_PORT); + omap_serial_ext_uart_disable(UART_PORT); wake_uart_enabled = wake; 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 */ |