Merge "power: pm8921-bms: reset coulomb counter when faking high ocv"
qup_i2c: Update clock ready check condition

While doing i2c transfer that involved write and
immediate read, the driver will put the controller
to RESET and do an immediate read before the write completes.
This issue is hard to produce internally because clock stretch
from slave device is involved during the failure time. CLK
state in QUP status register will be FORCED_LOW_STATE.

O/p fifo empty check added to determine clock idle.

CRs-Fixed: 455743
Change-Id: I51c1d9f9de42381fc85710e9185aa4177f6cd302
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
msm:crypto: Add validation checks for memory cleanup

Add validation checks to handle memory freeing &
prevent NULL pointer access.

Change-Id: I6e82ea56754fb12b467d5ecb642411017c1e18c6
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.173' into HEAD

* commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.173': (47 commits)
  ASoC: msm: Add support to fix up the channels for HDMI
  msm: clock-8960: Correctly measure KPSS pass3 debug clocks
  ASoC: wcd9310: Reset OTHR_RESET_CTR before power down
  msm: kgsl: Always send fence sync the timestamp it expects
  USB: android: Rate limit android enable warning
  USB: Rate limit adb open and release messages
  USB: mdm_bridge: Fix control bridge suspend
  USB: mdm_bridge: Simplify data bridge suspend/resume path
  msm_fb: display: balance secure map and unmap in each mfd
  msm:camera: Add new vfe32 commands
  msm_fb: Update MDP fence wait behaviour
  misc: isa1200: properly disable clocks
  misc: isa1200: add device tree support
  media: dvb: Fix secure demux application load check
  wcnss: Add support for nv bin download at coldboot
  msm: audio: qdsp6v2: Add support to configure ISO and ARIB coefficients
  ASoC: msm: qdsp6: Add support to configure ISO and ARIB coefficients
  msm_fb: display: fix fence fd list be put twice
  ASoC: msm: Mixer control to update the sample rate of HDMI interface
  msm: Add null pointer checks
  ...

Change-Id: Ib3c203fc14760f185b85d2ded827bc66a549c2d8
Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>

Conflicts:
	drivers/gpu/msm/kgsl_sync.c
Merge "wireless: add VHT (802.11ac) definitions"
Conflicts:
	include/linux/ieee80211.h
Merge "mac80211: include VHT capability IE in probe requests"
Conflicts:
	net/mac80211/main.c
	net/mac80211/util.c
Merge "msm: wfd: Correct logic to unmap mdp buffers"
Conflicts:
	drivers/media/video/msm_wfd/mdp-4-subdev.c
msm_fb: hdmi: proper vic for 576p

Corrected the AVI info data with right VIC for 576p@50 16:9

CRs-Fixed: 457252
Change-Id: I8536c141823e9d8436bdd8df0038d3e203ec0c4b
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
EHCI: HSIC: Halt the controller while resetting the port

commit 9ecc39cd (EHCI: HSIC: Implement new reset sequence to workaround
PHY lockup issue) does not halt controller before proceeding to reset
sequence.  If the controller is not halted and SOFs are transmitted, PHY
may stuck during port reset.

CRs-Fixed: 459280
Change-Id: I213ca7d41420596b91eb9b5e6803d1e237167136
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
media: dvb: Secure demux API updates

Update minor changes in the secure demux API introduced in
version 3.2: changed the write pointer error to a be reported as
a filter level status.

Change-Id: I2a85c8ba1c1d23faf15ad71c4b824e58e274efac
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
msm: socinfo: add new subtype definition for the SGLTE2 target

The SGLTE2 target is identified by subtype 9 in the platform
CDT info.

Change-Id: I61a0acea2c3bf8d5005094521a1f99c5f626bcf9
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: 8064: add platform device info for the sglte2 target

The sglte2 target has two external modems, an mdm9x15
and a qsc1215.

Change-Id: I0cd5b3cb20994e706536c2bbd4c0f82ada35058d
Signed-off-by: Joel King <joelking@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064-gpiomux.c
	arch/arm/mach-msm/devices-8064.c
mobicore: t-base-200 Engineering Release.

Support Nwd malloc() for WSM instead of forcing mcMallocWsm().
Other minor fixes.

Change-Id: I3a54da94593cba2d6dd6295e14177d494aa2ded9
Signed-off-by: Oana Medvesan <medvesan.oana@gmail.com>
[hnamgund@codeaurora.org: Drop changes to mobicore_kernelapi/main.c to
align with other branches, fix checkpatch failure in platform.h, fix
file mode on Makefile and Kconfig]
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
mobicore: t-base-200 Engineering Release.

TCI handle from one client can be used by any client.

Change-Id: I0ddf2aaefaaa6f1d281d17874f4c7412ec86be57
Signed-off-by: Oana Medvesan <medvesan.oana@gmail.com>
[hnamgund@codeaurora.org: Disable logging in platform.h]
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
ASoc: msm: Add support for VoLTE

- Add VoLTE_STUB FE for VoLTE stub session
- Add routing controls for VoLTE stub session

Change-Id: If2de711422320425dbb71ffcca88d78e354322bc
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
Merge "mobicore: New branch incorporating QC code review suggestions."
Conflicts:
	drivers/gud/mobicore_driver/build_tag.h
	drivers/gud/mobicore_driver/logging.c
	drivers/gud/mobicore_driver/main.c
	drivers/gud/mobicore_driver/mc_drv_module.h
	drivers/gud/mobicore_driver/mc_drv_module_android.h
	drivers/gud/mobicore_driver/mc_drv_module_fastcalls.h
	drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h
	drivers/gud/mobicore_driver/public/mc_drv_module_api.h
	drivers/gud/mobicore_driver/public/mc_kernel_api.h
	drivers/gud/mobicore_driver/public/version.h
	drivers/gud/mobicore_kernelapi/clientlib.c
	drivers/gud/mobicore_kernelapi/common.h
	drivers/gud/mobicore_kernelapi/device.c
	drivers/gud/mobicore_kernelapi/device.h
	drivers/gud/mobicore_kernelapi/include/mcinq.h
	drivers/gud/mobicore_kernelapi/main.c
	drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h
	drivers/gud/mobicore_kernelapi/session.c
	drivers/gud/mobicore_kernelapi/session.h
Merge "mobicore: MobiCore 1.2 kernel module Changes to MC11"
Conflicts:
	drivers/gud/mobicore_driver/api.c
	drivers/gud/mobicore_driver/arm.h
	drivers/gud/mobicore_driver/debug.h
	drivers/gud/mobicore_driver/fastcall.h
	drivers/gud/mobicore_driver/logging.h
	drivers/gud/mobicore_driver/main.c
	drivers/gud/mobicore_driver/main.h
	drivers/gud/mobicore_driver/mem.c
	drivers/gud/mobicore_driver/mem.h
	drivers/gud/mobicore_driver/ops.c
	drivers/gud/mobicore_driver/ops.h
	drivers/gud/mobicore_driver/pm.h
	drivers/gud/mobicore_driver/public/mc_linux.h
Merge "mobicore: t-base-200 Engineering Release"
Conflicts:
	drivers/gud/mobicore_kernelapi/main.c
Merge "mobicore: statically assign minor device numbers"
usb: f_serial: Remove unnecessary return statements in gport_setup

Driver allocates and initializes port associated with transport
for a serial interface by calling gport_setup. In case of HSIC
transport if port setup is successful gport_setup returns right
away without setting up hsuart port if it is present. As a result
if a usb composition has serial interface for both hsic and hsuart
transports then hsuart port will not be allocated and initialized.
This causes NULL pointer dereference of hsuart port later during
device enumeration.

Change-Id: I07959d88daace9e1a9351c19ee2d04900638a48b
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>