Merge "mmc: bus: print bus speed mode of UHS-I card" into ics_chocolate
Merge "mmc: sd: fix the issue with paranoid SD card init retry" into ics_chocolate
Merge changes I3f7ada44,I782b975f,I4fe82d99,I99c73c68,Iabed55b7 into ics_chocolate

* changes:
  msm: rtb: Separate initialization from enablement
  msm: rtb: Remove size parameter
  msm: rtb: Log the context id in the rtb
  msm: rtb: Give explicit numbers to log ids
  defconfig: msm8960: Enable PID saving in contextidr
defconfig: msm8960: enable IPv6 netfilter config

The IPv4 counterparts for the config are already enabled. Enable for IPv6
as well.

CRs-Fixed: 338428
Change-Id: Iebee1f08ab7fa044cc4f61c60afb71ec5a9e1837
Signed-off-by: Jin Hong <jinh@codeaurora.org>
(cherry picked from commit e5748902de356b48086c4c17754f32b7d9bf08dc)
msm_fb: display: disable mdp flip when enabling mdp solid fill

If both solid fill and flip mode are enabled, MDP underruns. So for
any pipe, if solid fill bit is set, flip operation modes including
left/right or/and up/done are disabled.

CRs-fixed: 334782
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
(cherry picked from commit 917ed6837ea5a43fe61b39ba0b966ae642fd9c4d)

Change-Id: I479285e5036b05b1997e66592fe178803ad990ee
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
tsif: port tsif to 8960

Updated board and device files with required definitions.
Added ADM CRCI definitions to dma.h.

Change-Id: I0230e3503f8165475234911d6fe839628f1c41aa
Signed-off-by: Joel Nider <jnider@codeaurora.org>
ASoC: wcd9310: Add run-time PM to codec startup and shutdown functions.

Add the run-time PM call to wcd9310 codec so Slimbus driver keeps Slimbus
clock on when the codec driver knows there is going to be audio streams
running on the codec.

Change-Id: If3115086ce1209cc3c543af4b400bc317a2eb889
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
msm: sdio: Remove sdio tty ciq device.

OEM's have requested to remove CIQ support from our sotfware,
hence remove sdio tty ciq device that exposes the SDIO_CIQ channel
to userspace. The channel configuration itself will be removed
from client on the modem side. Also remove the test code related
to SDIO_CIQ channel.

Change-Id: I47702dd024d9aa549b55b713b12732838fb665a8
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
(cherry picked from commit c4093f9ae5c77f8d7e14ca558d79e9a2484e0d96)
msm_fb: display: clean dsi fifo during dsi_off

During suspend, wait until dsi controller's fifo is
cleaned before disabling dsi controller. This will
prevent pixels that were left over in the fifo from
being displayed during next resume.

CRs-fixed: 336049
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
(cherry picked from commit 9d76704c8dac8f9e0794834cc4d62c17fd9cdf63)

Change-Id: I324baf23e281e4e6831ac0c196fe101ed7690ac4
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
regulator: pm8xxx-regulator: Fix regulator type bound check

Fix an off-by-one error in the pm8xxx-regulator probe function
which allows regulators configured with an incorrect type to
probe successfully.

Change-Id: I013abbd7098735863e96ac5c8eb69329ea93d136
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit 79952fec782eb0069734ad5e346fee59cbbdf0de)
Merge "fmem: reinitialize some qcache data upon returning to T-state" into ics_chocolate
Merge "defconfig: msm8960: enable IPv6 netfilter config" into ics_chocolate
Merge "tsif: port tsif to 8960" into ics_chocolate
Merge "clk: added tsif clocks" into ics_chocolate
defconfig: msm7627a: Increase vmalloc reserve to 200M

vmalloc reserve is increased to 200M, as with 1GB DDR the vmalloc
size is decreased, so now the vmalloc size equals to 512MB RAM device.

CRs-fixed: 345890
Signed-off-by: Taniya Das <tdas@codeaurora.org>
(cherry picked from commit 80478d03096d025cdd267e79ce20b5cce46b9b1d)

Change-Id: I29e13d3010facdac6f63417f0b9b8ce876e123da
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
Merge "regulator: pm8xxx-regulator: Fix regulator type bound check" into ics_chocolate
Merge "msm_fb: display: clean dsi fifo during dsi_off" into ics_chocolate
Merge "msm_fb: display: disable mdp flip when enabling mdp solid fill" into ics_chocolate
Merge "msm: sdio: Remove sdio tty ciq device." into ics_chocolate
Merge "defconfig: msm7627a: Increase vmalloc reserve to 200M" into ics_chocolate