Merge remote-tracking branch 'olio/mindtribe_dev' into android-3.10-bringup

Change-Id: Ib628ec8c5402bdaec5cc4924f674ba1c38206993

3 files changed, 20 insertions, 15 deletions

diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 481ec5e1976..a12cf478222 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -75,7 +75,7 @@
 		/* listed below will be reported as the wakeup reason */
 		/*                                                    */
 		/*             off  IRQ handle                        */
-		ti,pad_irq = <0x152  88  1>, /* uart1 - BT input      */
+		ti,pad_irq = <0x150  88  1>, /* uart1 - BT input      */
                      <0x9f6  143 1>, /* mpu6515 irq pin - is this offset correct?      */
                      <0x9ea  122 1>, /* bq27400 chg irq8 */
                      <0x9f4  123 1>, /* BT host wake          */
@@ -179,11 +179,6 @@
             0x1a8 0x004 /* CONTROL_PADCONF_MCSPI2_SIMO, (IDIS | PI | M4 ) */
             0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */
 
-            /* BT_WAKE_GPIO - for waking up BT */
-            /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ 
-            /* Now set this to regular old output */
-            0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */
-
             /* UART3 pins */
             0x16e 0x100  /* RX, input, off wake up   */
             0x170 0x000  /* TX, output */    
@@ -198,10 +193,15 @@
             /* 0x9f6 0x4104 */    /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | 
                                      OMAP_PIN_OFF_WAKEUPENABLE */
                            
-             0x14c 0x000     /* UART1, BT, TX  */
-             0x14e 0x000     /* UART1, BT, RTS */
-             0x150 0x4100    /* UART1, BT, CTS */
-             0x152 0x100     /* UART1, BT, RX  */
+            0x14c 0x000     /* UART1, BT, TX  */
+            0x14e 0x000     /* UART1, BT, RTS - E00 = output high off */
+            0x150 0x4100    /* UART1, BT, CTS */
+            0x152 0x100     /* UART1, BT, RX  */
+
+            /* BT_WAKE_GPIO - for waking up BT */
+            /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ 
+            /* Now set this to regular old output .. also off enable, output low. (0x600) */
+            0x0da 0x604 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */
 	    >;
 	};
 
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 */