Merge "msm: kgsl: Force the ME off before reading the microcode"
Merge branch 'kk_3.5_rb1.18' of git://codeaurora.org/kernel/msm into kk_3.5_rb1.15

Change-Id: Ie1b64bffbf4c8c008e69e5ce9f9684eb9cf6a251
ASoC: msm: qdsp6v2: Increase the DSP response timeout

Due to updates in the Fluence V5 algorithm, the initialization
sequence for Fluence V5 takes longer than 200ms. Voice driver
has a timeout of 200ms for DSP response. Increase the timeout
to 300msec to prevent voice call failures.

CRs-Fixed: 595881
Change-Id: I755dd13b796dbf9e0213a09b2925b1fc896b1e70
Signed-off-by: Deepa Madiregama <dmadireg@codeaurora.org>
Merge "mdp3: ppp: simplify ppp completion logic"
Merge "radio: iris: Fixed an issue with search stations list."
Merge "mmc: queue: scale down the max_segs if memory allocation fails"
Merge "USB: gadget: qdss: Flush pending works before function unbind"
i2c_qup: Improve implementation of PM callbacks

Refactor PM callbacks and remove redundant variable.
Add support for configuration of clockcontrol event.
Now the clock's state may be set by pm calls (as before)
or by a transfer's begining and ending.
Runtime-PM is still used in autosuspend configuration for
expensive NoC voting/unvoting since that may go to remote
processor.

CRs-Fixed: 592435
Change-Id: I54f7c67f768336f66765a04006b4c8e4734ac277
Signed-off-by: Gilad Avidov <gavidov@codeaurora.org>
Signed-off-by: Sagar Dharia <sdharia@codeaurora.org>
Signed-off-by: Sana Venkat Raju <c_vsana@codeaurora.org>
USB: dwc3-msm: Fix USB connection issue after DCP charger disconnection

Commit "6e3630b5f28c60c403af8c6b3c87679d3d98d6af: usb: dwc3-msm: Support
external charging detection " has added check not to start charger
detection in case charger detection is done by external circuit. when otg
driver calls charger_detection API to set charger type to invalid as part
of VBUS disconnect handling, this check prevents to do that. This results
next charger detection not happening after DCP charger disconnection.
Hence fix the issue by moving down the check in the charger_detection API.

Change-Id: I5c614a208f22e4cd9f334c80dae6831bcff64ada
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
thermal-core: Fix invalid sensor request not accounted correctly

Add NULL check for sensor name before using it in sensor_get_id and
return NULL explicitly when sensor id is not valid in get_sensor of
thermal core.

Change-Id: I4200a5691183aa2d40ef8ed64554f0beb8ce6d0d
Signed-off-by: Anji Jonnala <anjir@codeaurora.org>
msm: audio: qdsp6v2: disable read interrupts for smd channels

SMD channels are configured to send interrupts when the remote end
reads from the channels. Disable this behavior to reduce number
of interrupts.

Change-Id: I4c4f76c038b5f9b79c164a53306ccbe31c415d74
Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org>
msm: mdss:Add splash logo configuration entry in fb

Framebuffer driver displays penguin logo image
for all targets. Bootloader also displays the
same image. However, customer has to change this
boot image at two places if they want to display
different image than penguin logo. This change allows
customer to disable/enable the splash image from
framebuffer driver.

Change-Id: I56e78ce93aa8c218adffef03bfebd462d6bda254
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Merge "arm: new way of handling ERESTART_RESTARTBLOCK"
ARM: dts: msm: Disable Venus GDSC collapse for 8974v2.2 and 8974Pro

The sudden current draw occurring when restoring Venus from GDSC
collapse may cause general instability on some platforms. Disable
this feature by default.

CRs-Fixed: 597489
Change-Id: I4e62b913d0206063547ad59ccd8029aa1c5aee16
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Merge "i2c_qup: Improve implementation of PM callbacks"
Merge "USB: dwc3-msm: Fix USB connection issue after DCP charger disconnection"
msm: msm_bus: Don't program bw regs in dual config

When in dual configuration mode, don't program the bw registers
since they are already programmed at boot up.

Change-Id: I74d559f997b6374df7b68ffd022aa6d36beb7a9d
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
msm: msm_bus: Arbitrate IB for dual config masters

Arbitrate the IBs on nodes marked as dual config. This will prevent cases
where the last client's requests is always used to apply dual config rules.

Change-Id: I06f9a16e5f32c1cda7a5d04a72a6e5cf7dc9fae6
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
ARM: dts: msm: Modify bus vector for RNG client on msm8974

Modify the RNG (Random Number Generator) bus vector to use a different
originating master id, this change helps alleviate some slowdowns in boot
time noticed in targets where CPU is artificially bus throttled below a
threshold frequency.

Change-Id: Idf2a1d128f56e6aafebcbf0184ef2454d385be34
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
input: atmel_mxt_ts: Allow driver to compile in all scenarios

Driver needs dummy functions defined for cases when CONFIG_PM
is not enabled.

Change-Id: I4e9f0885eb9f7a45589b2362e468335a3ca57cba
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>