msm: vidc: Fix codec config frame with EOS flag issue

This change fixes the issue with improper handling of
codec config frame with eos flag in smooth streaming
scenario.

CRs-fixed: 467211
Change-Id: Iafd0a1a5a9073458fd139ed5845585747e51be8a
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
Merge "power: bms: Report zero SOC if voltage is below cutoff"
Conflicts:
	drivers/power/pm8921-bms.c
Merge commit 'c62e380e9ec16ae428bd97488fb49dc45353f9b9' into HEAD

Conflicts:
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/mdm_common.c
	drivers/power/pm8921-bms.c
	drivers/video/msm/mdp4_overlay.c
msm:rq_stats: Fix hotplug attribute during the suspend failure

If the system suspend fails, the hotplug_disable attribute remains
set. This prevents any change to core status from mpdecision. Reset
the value of this attribute if the module receives PM_POST_RESTORE
notification.

Change-Id: I22fd639134adbeb8f8f96603e285151480f537ec
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>
msm: camera: Add proper camera close sequence

Update camera driver to handle closing sequence properly
when there is a crash in userspace threads to restart
camera again.

Change-Id: Ic1956975fd18d262e9cf503055fb09d391f8c7d7
CRs-Fixed: 467053
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>

Conflicts:
	drivers/media/video/msm/server/msm_cam_server.c
msm: camera: Fix memory leak issue.

Initializing mctl client two times and it is
leading to memory leak. Add a check before
initialization to avoid the leak.

Change-Id: I5200442c1845238f92e76897d20c948c573f51ca
CRs-Fixed: 463672
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
msm: camera: Probe ov8825 & ov9724 drivers for 8930 SGLTE

i2c device registration for ov8825 & ov9724 is called for
8930 SGLTE device only

Change-Id: I722a31d883c8be14924462847741840b0af170a6
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
Merge "Merge commit 'c62e380e9ec16ae428bd97488fb49dc45353f9b9' into HEAD"
Conflicts:
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/board-8930.c
board: 8064/8960: Add battery current limit platform device.

Add battery current limit platform device into 8960 and 8064.

Change-Id: I99ade9b21fc364ddb306ee981f8fb8fb4b14c9b7
Signed-off-by: Anji Jonnala <anjir@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8960.c
power: battery_current_limit: Add Battery Current Limit Driver.

Add Battery Current Limit Driver(BCL).
The BCL driver will poll battery monitor system
if thermal daemon enables BCL.
It will notify thermal daemon if IBat crosses Imax threshold.

Change-Id: Id2368e42cc372fbc57e8b03d1e7e4b9c492ed965
Signed-off-by: Binqiang Qiu <bqiu@codeaurora.org>
ARM: mm: fix MMU mapping of CMA regions

Fix dma_contiguous_remap() so that it continues through all the
regions, even after encountering one that is outside lowmem.
Without this change, if you have two CMA regions, the first outside
lowmem and the seocnd inside lowmem, only the second one will get
set up in the MMU. Data written to that region then doesn't get
automatically flushed from the cache into memory.

Change-Id: I941c46baa951cb2a2c7aa151779fb48a4a488a74
CRs-Fixed: 467034
Signed-off-by: Chris Brand <cbrand@broadcom.com>
[extended patch subject with 'fix' word]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
ARM: dma-mapping: add support for CMA regions placed in highmem zone

This patch adds missing pieces to correctly support memory pages served
from CMA regions placed in high memory zones. Please note that the default
global CMA area is still put into lowmem and is limited by optional
architecture specific DMA zone. One can however put device specific CMA
regions in high memory zone to reduce lowmem usage.

Change-Id: I92ae4a772f24e0ca90c5560a826207850618b506
CRs-Fixed: 467034
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
[lauraa@codeaurora.org: Context fixups]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Conflicts:
	arch/arm/mm/dma-mapping.c
ARM: dma-mapping: Allow highmem pages to not have a mapping

The DMA_ATTR_NO_KERNEL_MAPPING is used to make sure that CMA
pages have no kernel mapping. Add support to make sure that
highmem pages have no mapping.

Change-Id: Ife76df126ecfedf0dba81a35e0de8a1787355b3d
CRs-Fixed: 467034
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
ASoC: msm8930: Update machine driver to support US/Euro headset

Add API to GND-MIC swap by toggle US-Euro GPIO.
Added callback function that triggers this API
during headset detection if US(Euro) type headset
is inserted into Euro(US) jack. On calling this API,
jack is changed back to US(Euro)type and headset is
detected.

Change-Id: Iec9a0f58a511c651ce6c516c77ffc86901767994
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
ASoC: wcd9304: Add MIC and GND swap headset dectect support

The European headsets have GND and MIC swapped jack from US headsets' view.
Detect European headset insertion on the US headset jack and vice versa,
report as headset insertion if there is a US/EURO select switch or report
as unsupported plug type.

Change-Id: I9947ff2aa84c72bac5e9d5f8c760d5a2e3743281
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
msm: 8930: Add Audio GPIO changes for 8x30 sglte

Add support for headset detection GPIO and US/Euro GPIO.
8x30 SGLTE has different GPIO numbers.
For US/Euro switch, GPIO is added to toggle the GND
and MIC at run time headset detection.

Change-Id: I26983e7a4231bf419dfca52cf41bfdba633e3b72
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
msm: camera: Probe ov8825 & ov9724 drivers for 8930 SGLTE

i2c device registration for ov8825 & ov9724 is called for
8930 SGLTE device only

Change-Id: I722a31d883c8be14924462847741840b0af170a6
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
Merge "mpq8064: Add support for GSBI6 UARTDM for Bluetooth feature"
Conflicts:
	arch/arm/mach-msm/board-8064.c
Merge "cfg80211: Extend support for IEEE 802.11r Fast BSS Transition"
Merge "ARM: dma-mapping: add support for CMA regions placed in highmem zone"
Conflicts:
	arch/arm/mm/dma-mapping.c