input: cy8c_tma_ts: Set scr_on_touch to false for Sweep2Wake when the screen is on
msm: smd_pkt: Handle wakelocks appropriately to optimize power usage

If the user-space application performs a poll() operation before a
read() operation, then release the wakelock in the read operation.
This is under the assumption that user-space application can grab a
wakelock between poll() and read() operations. If the user-space
application does not perform poll() operation at all before read()
operation, then allow the wakelock to timeout and release itself.

CRs-Fixed: 337654
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
(cherry picked from commit 048ef381aca6b150953a4e6d9b196778589f8e71)

Change-Id: I3cb6e1b06dbb08522dd66dcd8f5cfe4069fefdb1
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>

msm: smd_pkt: Add packet arrival wakelock

While handling the incoming packets from remote subsystems, delay the
system suspension by holding a wakelock with a timeout value of 2 seconds.
This will allow the user-space clients to process the incoming packets
before the system goes to suspend.

(cherry picked from commit c3c5cd93233bccaff0d0230932a5e387ce8dcd4a)

Change-Id: I488f795b76c8aad546a9b14b004d6a59be63b01c
CRs-Fixed: 335782
Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
power: fbearlysuspend: add sleep hack for CRT-off animation

HTC panels don't seem to work correctly with the Android
CRT-off animation. Add a short sleep period to let userspace
finish drawing the animation.

credit: kushdeck<kushdeck@gmail.com>
msm: audio: qdsp6v3: Add size safety check to ACDB driver

Check that the size sent by userspace is not larger
then the internal amount allowed. This protects
against overflowing the stack due to an invalid size.
bluetooth: backport from caf-msm-jb_3.2.1

Signed-off-by: Darescu Ionut <ionut.darescu@gmail.com>

Conflicts:
	arch/arm/configs/pyramid_defconfig
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	include/net/bluetooth/amp.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/sco.h
	net/bluetooth/af_bluetooth.c
	net/bluetooth/amp.c
	net/bluetooth/bnep/core.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/hidp/hidp.h
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/lib.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/core.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c

Conflicts:

	arch/arm/configs/doubleshot_defconfig
	arch/arm/configs/pyramid_defconfig
	drivers/bluetooth/bluetooth-power.c
	drivers/bluetooth/btusb.c
	include/net/bluetooth/amp.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/sco.h
	net/bluetooth/Kconfig
	net/bluetooth/Makefile
	net/bluetooth/amp.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/core.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c

Change-Id: Iac831fa876a4972af0a610a955e971dce5139f89
net: Import Bluetooth stack from Google's common 3.0 kernel

Conflicts:

	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/sco.h
	net/bluetooth/Kconfig
	net/bluetooth/Makefile
	net/bluetooth/amp.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c

Change-Id: I7837ed7c43b2cdc8e6050ef595987556a2b0b98f
qdsp6v3: Rename speaker_mono_rx to speaker_rx so it can initialize

credit: IAmTheOneTheyCallNeo