Merge changes I5e18b610,I3ab9288f into msm-3.0

* changes:
  mmc: msm_sdcc: data CRC errors are expected during HS200 tuning
  mmc: core: capture performance numbers only when asked
Merge "msm: mpm-8625: Disable interrupts for Idle PC" into msm-3.0
Merge "USB: Set AHB HPROT Mode to allow posted data writes" into msm-3.0
Merge "msm: copper: Add Android USB platform device" into msm-3.0
msm: clock: Hook into clock tracepoints

Tracepoints already exist for clk_enable(), clk_disable(), and
clk_set_rate(). Add callbacks for these tracepoints so that we
can easily trace clock operations in the kernel.

For example:
 # pwd
 /sys/kernel/debug/tracing
 # echo 1 > events/power/clock_enable/enable
 # cat trace
 <lots of clock enables>

Change-Id: I3b845653be427ff4b33bb31b5b82f73c4695d230
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
video: msm: wfd: Add support for multiple wfd device nodes

Creating another wfd device node for secure capture. Accordingly
changed the probe such that multiple wfd devices are supported.

Change-Id: I3f0db8c32c7a8aa8d6886c970c6a4cb9612e8857
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
msm: clock-8960: program PLL15 on 8930

Bootloader does not configure PLL15 since PLL15 is only
enabled/disabled by linux kernel code. Therefore, configure
PLL15 during clock init.

Change-Id: I536325362a9ab9f054b6f65390052a3b8c720e08
Signed-off-by: Tianyi Gou <tgou@codeaurora.org>
msm: 8930: Fix sd card write-protect gpio polarity

Setting the correct polarity for the 8930 sd card write protect
gpio.

Change-Id: I5b405f9fda0174dbbf9177b1a8fa11f2ea6a99a6
Signed-off-by: Krishna Konda <kkonda@codeaurora.org>
Merge changes I2cabb2d6,Idffba143 into msm-3.0

* changes:
  ASoC: msm8960: properly protect external mclk control function
  ASoC: wcd9310: Add plug detection through mechanical switch
Merge "msm: board-8064: Place the movable zone" into msm-3.0
Merge "msm: 9x15: Don't build PIL (Peripheral Image Loader) driver" into msm-3.0
Merge changes I3984d747,I9a436f63 into msm-3.0

* changes:
  msm: board-8930-pmic: Add default configuration for LED anode power source
  power: pm8921-charger: Add feature to use charger LED
Merge "ARM: local timers: Add A15 architected timer support" into msm-3.0
USB: OTG: Migrate to devm_regulator_get()

Clean up some error paths and simplify the code by
moving to devm_regulator_get().

Change-Id: I782569d2d5aec077ea18516db7eba92897698bce
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
gpu: ion: Map a range into the IOMMU

Instead of mapping 1 4K page at a time into the IOMMU create a
scatterlist and map everything at once. This will be more efficient.

Change-Id: I8e83066869dd6f7a479bad22a66e4c70cc5973b5
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
msm: gss: Correct the ramdump segment addresses

Fix the ramdump segment addresses for gss-8064 driver.

Change-Id: I7a7272d5c0a8fb71a9061cd2fa7c9118d20d0f3a
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Merge changes I16f522e7,Ifa5b3bc2 into msm-3.0

* changes:
  Merge branch 'google-android' into msm-3.0
  locking, kprobes: Annotate the hash locks and kretprobe.lock as raw
Merge changes Ia5afcf33,Ibd380f8e,Icec5b28f into msm-3.0

* changes:
  msm_fb: display: Add IOMMU support to MDP and rotator driver
  msm_fb: display: Wait for external vsync before turning off DTV
  msm_fb: display: Enable timing generator during first update
Merge changes Idf3aff7d,I090d1914 into msm-3.0

* changes:
  msm: smem_log: Initialize SMEM_LOG SMEM entries independent of modem
  msm: smd: Add notifier chain to generate SMSM driver state notifications
msm: smd: Do not use wakelock for local DEM notifications

Notify local SMSM callback clients without using a wakelock since SMSM
signaling is used by power management during power-down/-up sequencing
on DEM-based targets.  Grabbing a wakelock in this case will abort
power-down sequencing.

Change-Id: I08de41480a9713f8ac52b563c7df8213d465466d
Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>