Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

2 files changed, 6 insertions, 1 deletions

diff --git a/src/hardware.c b/src/hardware.c
index 8ea1c61..64f8dd6 100755
--- a/src/hardware.c
+++ b/src/hardware.c
@@ -1385,9 +1385,10 @@ uint32_t hw_lpm_get_idle_timeout(void)
      */
     timeout_ms = (uint32_t)lpm_param.host_stack_idle_threshold \
                             * LPM_IDLE_TIMEOUT_MULTIPLE;
-
     if (strstr(hw_cfg_cb.local_chip_name, "BCM4325") != NULL)
         timeout_ms *= 25; // 12.5 or 25 ?
+    else if (strstr(hw_cfg_cb.local_chip_name, "BCM4358") != NULL)
+        timeout_ms *= 50;
     else
         timeout_ms *= 300;
 
diff --git a/src/upio.c b/src/upio.c
index 3f73482..d24d496 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -507,6 +507,10 @@ void upio_set(uint8_t pio, uint8_t action, uint8_t polarity)
             }
 #endif
 
+#if (BT_WAKE_VIA_PROC_NOTIFY_DEASSERT == TRUE)
+            lpm_proc_cb.btwrite_active = TRUE;
+#endif
+
             UPIODBG("%s: proc btwrite assertion, buffer: %c, timer_armed %d %d",
                     __FUNCTION__, buffer, lpm_proc_cb.btwrite_active, lpm_proc_cb.timer_created);