Merge "defconfig: msm7627a: Enable GPIO regulator driver" into msm-3.4
Merge "msm: Remove VFE global variable" into msm-3.4
Merge "ASoC: msm: Add 4 front ends to support Multiple playback use case" into msm-3.4
Merge "video: msm: Don't make the framebuffer cached" into msm-3.4
Merge "ASoC: apq8064: properly protect external mclk control function" into msm-3.4
Merge changes Id6a4cc88,I5b3ae2c8 into msm-3.4

* changes:
  msm: board-qrd7627a: Add gpio regulator for ov8825 sensor
  board-msm7627a: Display: Add support for shared GPIO
Merge "ASoC: wcd9310: Route MBHC override to micbias 2 during calibration" into msm-3.4
ASoC: msm: Add routing control to route voice to HDMI

Add mixer control to route voice to HDMI.

Change-Id: Id94bdefc302edbcbc82a3430abee0f6d361075a1
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
usb: dwc3: Fix merge conflict for USB_DWC3_MSM

Re-push the following commit due to merge conflict problem:
usb: dwc3: add USB_DWC3_MSM peripheral controller choice.
b01e3c740db6c0c68e3d503cf4d80d115abead33

Change-Id: Icfb94ddd5293004e9afeec3dd3d081de8e109d44
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
usb: dwc3: Fix merge conflict for not auto select USB_GADGET_SUPERSPEED

Re-push the following commit due to merge conflict problem:
usb: dwc3: USB_DWC3_MSM not auto select USB_GADGET_SUPERSPEED
7f989ac838faa0a68abd0162c77aff273df2012a

Change-Id: I17e8e2ee5af9fc136b749f282a91f16c45d6fa68
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
usb: dwc3: Fix dwc3 device name for MSM platfrom

Since the change "usb: dwc3: fetch mode of operation from HW"
the dwc3/core.c driver is not using id_table anymore in order
to specify which devices this driver support.

Therefore, for the device<->driver attachment to succeed
on MSM platform we need to allocate a device with the same
driver name as of dwc3/core.c

Change-Id: Ic709a6c33dd482b7c085ebf4b60914558d32271b
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
usb: dwc3-msm: use generic map/unmap routines

Use usb generic routines instead of dwc3 specific.

Change-Id: Iacbcc1fb0285a646bf1eb306d8cd4b5a7cd920a1
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
usb: dwc3-msm: convert TRBs into bitshifts

This change is compliant with the following commit:
usb: dwc3: convert TRBs into bitshifts
f6bafc6a1c9d58f0c234ac5052b9c09b0747348c

Change-Id: Iffac2549f6bc966156920de7f1947d72f43efd81
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
mmc: card: Fix packing control enabling algorithm

When hitting a stop potential packing event, we should zero
num_of_potential_packed_wr_reqs, so that the packing won't be
enabled too early.

Change-Id: I1b23f43e00490c086a61c95e640bf71f1e976cf8
Signed-off-by: Maya Erez <merez@codeaurora.org>
board: msm7x27a: Fix the battery capacity calculation logic.

Battery capacity calculation is missing boundary checks. This
is causing capacity to be more than 100%, when battery voltage
goes below minimum operating voltage. This inturn is causing
failure to trigger graceful shutdown at low voltages. Fix is
to have the boundary checks in capacity calculation.

CRs-Fixed: 369687
Change-Id: I25e9a09d4d9d0cb03ee38f589d20e5f807e801c9
Signed-off-by: Krishna Vanka <kvanka@codeaurora.org>
msm: smp: Remove WFE/SEV from secondary core bootup

During the cold boot path once the secondary core is released
out of reset we keep looping for the pen release variable.
The wfe+sev in this path are just unnecessary as they provide
negligible power savings, and the latency cost is not worth it.
During the hotplug path the secondary core will be in wfi and
only an interrupt will be able to bring the core out.
Removing the wfe effectively lowers the hotplug latency.

Change-Id: Ic54636ceafb8abf3b6733e5699733543d64776d5
Signed-off-by: Taniya Das <tdas@codeaurora.org>
arm/dt: msmcopper: Change LDO13 constraints to support 1.8V

LDO13 powering VDDPX_2 (SD card I/O) pad supports switching
between 1.8V and 2.95V. Hence, change the constraints to
accomodate 1.8V.

Change-Id: Ib4569273e7b75cb9964b4c9e865dbc1c1e6fdd46
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
mmc: msm_sdcc: Fix race in disabling sdcc core irq

o Assume SDCC driver has SDIO clients attached and
  runtime clock gating has turned off the SDCC clocks.

o Now, if the SDIO client driver has initiated a request
  to SDCC and since the clocks are turned off, mmc framework
  tries to turn them on calling msmsdcc_set_ios().

o msmsdcc_set_ios() tries to disable the core irq first and
  reenable after the clocks are turned on. While in process
  of disabling the irq, if there is an asynchronous notification
  from SDIO client h/w, it will preempt ongoing disable and run
  msmsdcc_irq() which internally does disable_irq_nosync() since
  the clocks are still off.

o While the control returns to msmsdcc_set_ios() from preemption
  it will continue disabling the core irq (even though
  host->sdcc_irq_disabled = 1). In effect, calls disable_irq()
  twice increasing the irq desc->depth to 2.

o The enable_irq() API enables the irq in h/w if and only if
  desc->depth = 1, and hence become a noop if it is called with
  desc->depth = 2 causing sdcc failure because the interrupts
  are not enabled in h/w.

Fix the above race condition by making sure disable irq is done
atomically.

CRs-Fixed: 357406
Change-Id: Id8a4e5cc9b0ac035a83c070ede57b2c39d96e6e9
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
board: storage: enable eMMC DDR capability for non-CDP platforms

When eMMC runs in DDR mode on CDP platform, we have seen instability
due to DATA CRC errors. These errors are attributed to long physical
path between MSM and eMMC on CDP.

So disable the DDR mode on CDP platform only and let other platforms
take advantage of eMMC DDR mode.

NOTE: eMMC DDR mode instability was observed only on MSM8960 and
MSM8930 CDP platforms.

CRs-Fixed: 371242
Change-Id: I882e7a7c3e352a0f9c2ebe4362c55c22decef53b
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
ASoC: wcd9310: Don't overwrite detected unsupported headset

The current US/EURO headset detection algorithm is overwriting detected
unsupported headset detection with invalid headset detection.
Don't make it to overwrite to report unsupported headset correctly.

CRs-fixed: 359290, 368319
Change-Id: If2d02c0d68be1c6f3f2eb1aa89c7a08ffe166446
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>