mmc: Fix merge error

Change-Id: I8dd94e9d21d1d567a65c1de290be240b43d22c72
mmc: sdhci: Add a mechanism to disable HPI

Certain cards might cause a timeout when used with HPI mode
due to card specific issues. Provide a mechanism where HPI
mode can be turned OFF to workaround such issues.

Signed-off-by: Naveen Ramaraj <nramaraj@codeaurora.org>
msm: sdcc: Move vdd to optional property

Some devices might not use the vdd. So move vdd to optional property and
avoid controling the vdd in that device if qcom,not-use-vdd exists.

Change-Id: Ic504e7c2f6311cf158fc77fdc28b2723679826af
Signed-off-by: Devin Kim <dojip.kim@lge.com>
mmc: block: fix a bug of error handling in MMC driver

Current MMC driver doesn't handle generic error (bit19 of device
status) in write sequence. As a result, write data gets lost when
generic error occurs. For example, a generic error when updating a
filesystem management information causes a loss of write data and
corrupts the filesystem. In the worst case, the system will never
boot.

This patch includes the following functionality:
  1. To enable error checking for the response of CMD12 and CMD13
     in write command sequence
  2. To retry write sequence when a generic error occurs

Messages are added for v2 to show what occurs.

cherry-picked it from
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/mmc?id=c8760069627ad3b0dbbea170f0c4c58b16e18d3d

Change-Id: I2bc5224a83b931a11e4664c449050323c34cdec5
Signed-off-by: KOBAYASHI Yoshitake <yoshitake.kobayashi@toshiba.co.jp>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Devin Kim <dojip.kim@lge.com>
ASoC: msm: Disable the DOLBY-DAP (DO NOT MERGE)

We disable the dolby-dap temporarily until ready to use the dolby-dap.

Change-Id: Ie01441c8d6e3dd95ae651cb0e9aac7b0443e5384
Signed-off-by: Devin Kim <dojip.kim@lge.com>
PM / Sleep: Add wake lock api wrapper on top of wakeup sources

Change-Id: Icaad02fe1e8856fdc2e4215f380594a5dde8e002
Signed-off-by: Arve Hjønnevåg <arve@android.com>

Sultanxda: This is needed by bcmdhd (WiFi).

Original commit: https://github.com/android/kernel_msm/commit/5deedcd8fcfadf7eaa7e5fe206a400b2d08ffacf

Signed-off-by: Sultanxda <sultanxda@gmail.com>
of: Kconfig: Don't enable OF_BATTERYDATA by default
Sultan_defconfig: Update from Google AOSP L-preview kernel