ASoC: msm: Check stream id for ASM callbacks in compress driver

Send stream id to DSP for asm commands which requires stream and
session information. Stream and session id is added as token
parameter for DSP commands. Use token parameter to interpret the
stream for which the callback is received.

Conflicts:

	sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

Change-Id: I58a40d84f60f4a4172ec7ee79302c8bfb24c910b
Signed-off-by: Krishnankutty Kolathappilly <kkolat@codeaurora.org>
Merge "ASoc: msm: qdsp6v2: Fix for NULL check"
ARM: dts: msm: Add NFC device for 8974 fluid

Add nfc nci device to the device tree for 8974 fluid and nfcc is
dependant on i2c BLSP1 QUP6. The data is represented in
device tree format and pass by the driver using of framework API

Change-Id: Ib03a7dbb550729d1810f7a070a49c8e1a9619971
Acked-by: Umesh Jagga <ujagga@qti.qualcomm.com>
Signed-off-by: Houston Hoffman <hhoffman@codeaurora.org>
Merge "Merge "Merge "Revert "wlan: Setting Max Tx Power Limit for specific band""""
Merge "Merge "Merge "ASoC: msm: Add Buffer overflow check"""
ARM: dts: msm: disable CPR for msm8926-v2

Disable CPR for msm8926-v2 due to stability issues.

CRs-fixed: 607899
Change-Id: Ifc9018f7a2f48d933be9cb87d6df51610f583cf8
Signed-off-by: Ke Liu <keliu@codeaurora.org>
ARM: dts: msm: move external power supply configuration for msm8926-v2

Move external VDD_APC power supply configurations from msm8926 to
msm8926-v2-ext-buck file as the external power supply only exists on some
msm8926-v2 boards.

CRs-fixed: 607899
Change-Id: I73d333b8b7d0489f06fa1f5e34a8cb9576a86062
Signed-off-by: Ke Liu <keliu@codeaurora.org>
msm: cpr-regulator: add a new vdd-mx voltage selection method

Add support to choose VDD_MX voltage according to VDD_APC fuse corner.

CRs-Fixed: 607899
Change-Id: If3d5dd4c919d50736c4eaa5449f835b2e8f38d3f
Signed-off-by: Ke Liu <keliu@codeaurora.org>
ARM: dts: msm: limit VDD_MX requests to 1.2875 V for msm8926-v2

The requirement that VDD_MX be greater than or equal to VDD_APC has been
relaxed on msm8926 v2 in order to allow higher VDD_APC voltages. Because
of this, VDD_MX is limited to a maximum voltage of 1.2875 V by the RPM.
Requests for voltages higher than this limit will cause the system to
crash.

Update the maximum voltage for pm8226_l3 (VDD_MX) regulator nodes to
match the 1.2875 V requirement. Also add a vdd-mx mapping table in the apc
vreg_corner node and change the vdd-mx-vmin selection method to utilize
the table. This ensures that CPR does not attempt to request a voltage
higher than 1.2875 V when operating in the turbo voltage corner.

CRs-Fixed: 607899
Change-Id: Id13b3fcae8cca0848a9e5990978125ba7dcbe572
Signed-off-by: Ke Liu <keliu@codeaurora.org>
mmc: card: quirk: disable cache for Hynix card

This change prevents enabling cache during card init for Hynix cards.
This change is workaround the problem of Hynix cards behavior for
adb reboot flow, when as a result of power cycle with cache enabled,
ext4 journal get aborted, because of meta data corruption.

Signed-off-by: Konstantin Dorfman <kdorfman@codeaurora.org>

Conflicts:

	drivers/mmc/card/block.c
	include/linux/mmc/card.h

Change-Id: I721689da65e803965f1c7dd148754c4f19a64857
Signed-off-by: Maya Erez <merez@codeaurora.org>
msm: thermal: Initialize per cpu variables during thermal init

Initializing the per cpu variables inside frequency/hotplug
probe function has a possibility that it may result in
uninitialized variables. So initialize the per cpu variables
in the thermal drivers init function.

Change-Id: I18e65a4bc2f5bba279d1971701ac0877a5391395
Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
msm: kgsl: Refcount mmu clock calls and allow multiple disable events

Allow each mmu clock enable call to enable the clock and let the
clock driver refcounting mechanism deal with switching the clock
off at the right time. This also means that each enable call should
have a disable call or a disable event registered, so allow for
multiple disable events to be registered. This simplifies the mmu
clock handling mechanism which is better for multiple ringbuffer
implementation. With multiple ringbuffers each global timestamp is
tied to a specific ringbuffer and with a single clock disable event
it is hard to figure out when the clock should be turned off.

CRs-fixed: 597193 592485
Change-Id: I924c545140bd19d95890a5fdfd0382c511abe973
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Merge "msm: vidc: add LTR support for video encoder"
mm: fix calculation of dirtyable memory

The system uses global_dirtyable_memory() to calculate number of
dirtyable pages/pages that can be allocated to the page cache.  A bug
causes an underflow thus making the page count look like a big unsigned
number.  This in turn confuses the dirty writeback throttling to
aggressively write back pages as they become dirty (usually 1 page at a
time).  This generally only affects systems with highmem because the
underflowed count gets subtracted from the global count of dirtyable
memory.

The problem was introduced with v3.2-4896-gab8fabd

Fix is to ensure we don't get an underflowed total of either highmem or
global dirtyable memory.

Change-Id: Ib0c4a8f99870edc5ded863b88a472f2836c690d2
Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Puneet Kumar <puneetster@chromium.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Tested-by: Damien Wyart <damien.wyart@free.fr>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: c8b74c2f6604923de91f8aa6539f8bb934736754
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Merge "NFC: add gpio clk interrupt for 8610 qrd device"
Merge "NFC: Set PLL before attempting to prepare clk src"
Merge "NFC: Introduce a presence check"
Merge "msm: vidc: Add generic LTR mode support"
Merge "[media] v4l2: Add enum for frame level QP extra-data"
Merge "msm: vidc: Add support to request frame level QP information"