Merge "media: dvb: Seperate secure demuxing to secure feeds only"
Conflicts:
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.h
msm_fb: display: don't enable blt mode

The switch of blt mode may cause mdp hang on some targets. To avoid
blt switch, we won't allocate the pipe that requires blt
mode. Basically this implies two things: downscaling is done by
rotator and gpu composition is used in case of blt mode is needed.

Change-Id: I2d6f1a0e33a40af90e3a1a013a1b48b0df0c8ea2
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
ASoC: wcd9304: Resend edge triggered GPIO IRQ

If MBHC GPIO IRQ for mechanical headset detection asserted while power
management's suspend call chain is being called, wcd9xxx_lock_sleep will
fail to wait for system's resume since power management interface has
to finish suspend in order to resume system.
In this case, interrupt cannot be handled as codec driver cannot
guarantee if underlying bus is awake.
Wake up system and resend the IRQ for this situation.

Change-Id: I8fb58ee6c3eb310e63dfc2e31f4055488d552d45
CRs-Fixed: 458899
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
msm: wfd: Map double the size of reconstruction buffer

The MFC core has a hardware bug which causes it to access memory beyond
what is given.  This commit adds a workaround by mapping double the
buffer size into IOMMU.

Change-Id: Ib20a44f140f6c34d3e85205afb1cd00ee74f263c
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184' into HEAD

* commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184': (62 commits)
  ASoC: msm: qdsp6: Check copp_id's array index
  msm_serial_hs_lite: Don't set UART clock to zero always
  msm: 8064: Add support for GSBI4 based UARTDM
  usb: f_serial: Remove unnecessary return statements in gport_setup
  wcnss: Configure bite interrupt as edge triggered
  mobicore: t-base-200 Engineering Release.
  mobicore: t-base-200 Engineering Release.
  msm: 8064: add platform device info for the sglte2 target
  msm: socinfo: add new subtype definition for the SGLTE2 target
  qup_i2c: Update clock ready check condition
  msm: kgsl: Add event tracepoints
  msm: kgsl: Resolve a potential race in the interrupt handler
  msm: kgsl: Check the current interrupt status before power operations
  power: pm8921-charger: Make charger removal detection workaround optional
  mobicore: statically assign minor device numbers
  mobicore: t-base-200 Engineering Release
  mobicore: MobiCore 1.2 kernel module Changes to MC11
  mobicore: New branch incorporating QC code review suggestions.
  net: usb: Add MUX support in embedded rmnet driver
  power: pm8921-charger: get rid of using LPM
  ...

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

Conflicts:
	arch/arm/mach-msm/board-8064.c
	drivers/gud/mobicore_driver/main.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/power/pm8921-charger.c
ASoC: msm: Fix for improper volume ramp up in tunnel playback

A disturbance is heard when resuming the playback after
switching from headset to speaker and back to headset with the
music paused for more than 3 sec. This is due to, data getting
rendered with the speaker volume where it had to played with headset
volume. Fix is to set the '0' as the initial volume.

Change-Id: Ie4726a7898620fb912279270e24fa15a45a437f9
CRs-fixed: 453704
Signed-off-by: Amal Paul <amal@codeaurora.org>
msm: sglte2: change the soft reset gpio for the qsc modem

It was found that pmic gpio 2 has a conflict so the
soft reset gpio is now changed to pmic gpio 23.

Change-Id: I550769278de4112cdf7d3b67e9173a2d7a19f105
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: board-8064-camera: disable i2c for sglte2

GSBI4 is used to configure i2c for camera control. In SGLTE2 platform,
GSBI4 needs to be used for UART. So, disabling the i2c mux register
for camera in acse of SGLTE2 platform

Change-Id: Ide0dc353e669105271b6b25d1fe445f135b74572
Signed-off-by: Punit Soni <punits@codeaurora.org>
Merge "Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184' into HEAD"
Conflicts:
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/devices-8064.c
	drivers/gud/mobicore_driver/main.c
	drivers/media/video/msm/vfe/msm_vfe32.c
ASoC: msm: Change SGLTE to Voice2 for reusability of code

-Use Voice2/VOICE2 instead of sglte/SGLTE in function and variable names
-Voice2 call can represent SGLTE call or DSDA call

Change-Id: I0a5ce71cb1042bfbc08159f01aeab26a030b86dc
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
ASoC: apq8064 : Fix for voice over USB in Fusion target

- currently APQ assumes 8k and mono as USB parameters for
  voice over USB but MDM configures with 48k and stereo
  as USB parameters which results a mismatch between APQ
  and MDM configurations
- Set the APQ parameters in sync with MDM

Change-Id: Ibbdf6bb620b4fd2c25ba6879477488c85c5defc9
Signed-off-by: VidyaKumar Athota <vathota@codeaurora.org>
CRs-Fixed: 415079

Conflicts:
	sound/soc/msm/apq8064.c
usb: gadget: serial: Limit write permissions to root

android compatibility test suite complains if others have write
permission. Hence, limit the file permissions to root.

Change-Id: I3f607b307b7ecb6c01180bc752681b02e6e54c7a
Signed-off-by: Vamsi Krishna <vskrishn@codeaurora.org>
ASoC: msm: Add support for Voice2

- Add FE VOICE2_STUB for Voice2 session
- Add routing controls for Voice2 session

Change-Id: I8175b3cbbff33a56b83cc953451506f123abd231
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
msm: camera: Fix flash issue timeout

Add timer and refresh logic for flash to work
in torch mode until user changes flash stae.

Change-Id: I9f6e5fb8de60015d354234c65fd0e53733bcb4f5
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
mmc: card: abort the suspend if the card is busy

mmc_blk_suspend() is triggered when system is going into suspend which
then waits for the mmcqd thread (which processes active MMC transfer
requests) to complete all queued transfer requests but if mmcqd has
multiple requests to be processed at this point, mmc_blk_suspend() may
very well sleep for duration longer than DPM (Device Power Management)
timeout (currently 12 sec) causing the DPM timeout bug.

To fix this issue, mmc_blk_suspend() checks if there are any more pending
MMC requests in progress or not and if there are any, it returns error
which should abort the ongoing system suspend.

CRs-Fixed: 439192
Change-Id: Ic7ba2f013d10a1952c30ea2ed93f74b831fcc27d
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
power: pm8921-charger: Add error handling logic

Handle return errors at multiple locations and report them
appropriately. While at it, fix functions which can report
valid negative values.

CRs-Fixed: 389633
Change-Id: Ib3b8121d721d17bc9086decd94ee10239a2ec5f4
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>

Conflicts:
	drivers/power/pm8921-charger.c
mmc: msm_sdcc: fix the clock selection logic in DDR mode

MSM SDCC controller requires the internal clock frequency to set be
doubled when running in DDR (Dual Data Rate) mode and existing
clock selection logic used to work fine until the MMC clock scaling
functionality got added. With clock scaling now, clock (ios->clock)
might get scaled down from 50MHz to 25MHz during DDR mode operation
and existing clock frequency selection logic may not change the clock
frequency when we move back from 25MHz to 50MHz.

This patch fixes the above issue and also simplifies the clock frequency
selection logic in DDR mode.

CRs-Fixed: 458926
Change-Id: I60f9ae2d5a7f92031fb46d9b16676c74363e7b9f
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
mmc: msm_sdcc: fix data timeout calculation for DDR bus speed mode

When card operates in DDR (Double Data Rate) bus speed mode,
most of the HW logic of SDCC controller needs to have clock
frequency that is twice the clock frequency going out to card.
For example, if a card operates at 50MHz clock in DDR mode then
internally SDCC controller logic will operate at a clock of 100MHz.

But SDCC controller's data timeout logic works on the clock rate
that actually goes to card. So this change calculates the data
timeout value based on the clock frequency that goes to card rather
than SDCC controller's clock frequency.

CRs-Fixed: 450675
Change-Id: Icd8b648eae0ad4efad2598749bed7b0bd65c65c9
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Krishna Konda <kkonda@codeaurora.org>
mmc: msm_sdcc: check for pending_resume in SDCC system suspend

If system comes out of suspend, msmsdcc_pm_resume() sets the
host->pending_resume flag if the SDCC wasn't runtime suspended.
Now if the system again goes to suspend without any SDCC activity
then host->pending_resume flag will remain set which may cause the SDCC
resume to happen first and then suspend.

To avoid this unnecessary resume/suspend, make sure that pending_resume
flag is cleared before calling the msmsdcc_runtime_suspend().

CRs-Fixed: 438081
Change-Id: I2b667bec704f938a532d4780dd9b7937e2eb12c7
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Merge "msm: pm: Update spm retention sequence to support per core retention"
Conflicts:
	arch/arm/mach-msm/board-8960.c