Merge "spi_qsd: Auto-select nearest lower available clock rate"
Merge "spi_qsd: Correction in DMA mode check."
power: pm8921-charger: usb ovp trim for pm8921

This change adds the usb trim table for two
variants of PM8921. The correct PMIC is chosen
based on PM8921_USB_TRIM_SEL_BIT.

Change-Id: If0b832a2d571dff37fe5f7ea7e4b928aa60f9d03
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
msm: Camera: Add new Actuator type and register init in config

Add HALL EFFECT Actuator and REG_INIT config for Actuator.

Change-Id: I775e2c58fd32b4371b1805ecfe48e88703715141
Signed-off-by: Lokesh Kumar Aakulu <lkumar@codeaurora.org>
(cherry picked from commit 5674e9cb6c1d75d33d2785b71f1b8395ba821d17)

Conflicts:

	include/media/msm_camera.h

Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
Merge "msm: Camera: Add new Actuator type and register init in config"
Merge "msm_serial_hs: Donot register UART device as PM runtime active"
hrtimer: Don't reinitialize a cpu_base's lock on CPU_UP

The current code makes the assumption that a cpu_base lock cannot
be held if a CPU is offline, which is tragically wrong.

If a hrtimer is not queued, then it will not be migrated by
migrate_hrtimers() when a CPU is offlined. Therefore, the
hrtimer's cpu_base may still point to a CPU which has
subsequently gone offline if the timer wasn't enqueued at the
time the CPU went down.

Normally this wouldn't be a problem, but a cpu_base's lock is
blindly reinitialized each time a CPU is brought up. If a CPU is
brought online during the period that another thread is
performing a hrtimer operation on a stale hrtimer, then the lock
will be reinitialized under its feet, and a SPIN_BUG() like the
following will be observed:

 [  448.212369] BUG: spinlock already unlocked on CPU#3,
 swapper/3/0
[  448.217368]  lock: 0xc47b1a40, .magic: dead4ead, .owner:
swapper/3/0, .owner_cpu: -1
[  448.217398] [<c0014398>] (unwind_backtrace+0x0/0x120) from
[<c0269ab0>] (do_raw_spin_unlock+0x44/0xdc)
[  448.217419] [<c0269ab0>] (do_raw_spin_unlock+0x44/0xdc) from
[<c071bbb0>] (_raw_spin_unlock_irqrestore+0xc/0x38)
[  448.217438] [<c071bbb0>]
(_raw_spin_unlock_irqrestore+0xc/0x38) from [<c00aa498>]
(hrtimer_try_to_cancel+0xf8/0x10c)
[  448.217455] [<c00aa498>] (hrtimer_try_to_cancel+0xf8/0x10c)
from [<c00aa4bc>] (hrtimer_cancel+0x10/0x20)
[  448.217475] [<c00aa4bc>] (hrtimer_cancel+0x10/0x20) from
[<c00e6934>] (rcu_idle_exit_common+0x5c/0xe0)
[  448.217494] [<c00e6934>] (rcu_idle_exit_common+0x5c/0xe0) from
[<c00e6ae8>] (rcu_idle_exit+0x9c/0xb4)
[  448.217514] [<c00e6ae8>] (rcu_idle_exit+0x9c/0xb4) from
[<c000f2dc>] (cpu_idle+0x98/0xf0)
[  448.217529] [<c000f2dc>] (cpu_idle+0x98/0xf0) from
[<000081ac>] (0x81ac)

CRs-Fixed: 460670
Change-Id: I588f6a864054abe6d4c249aad815c6d2f5a54077
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
Merge "media: dvb: Fix SDMX process size when crossing limit in TSIF"
msm8930 sglte: Add support for GSBI10 for serial console

This change adds GSBI10 UARTDM device and required resource
(its GPIOs and clocks) with their configurations for 8930
SGLTE EVT1 for serial console functionality.

CRs-Fixed: 459320
Change-Id: I14b9300c1a92cba5c1477aa35be0c83d4b46730f
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
msm8930 sglte: Add support for GSBI11 for serial console

This change adds GSBI11 UARTDM device and required resource
(its GPIOs and clocks) with their configurations for 8930
SGLTE EVT2 for serial console functionality.

CRs-Fixed: 459320
Change-Id: I552da00481feefb9b8c6857799995b5a0caade85
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
Merge "hrtimer: Don't reinitialize a cpu_base's lock on CPU_UP"
Merge "board: 8930: Configure LDO L17 as always_on for 8930 SGLTE"
Merge "msm8930 sglte: Add support for GSBI10 for serial console"
Merge "msm8930 sglte: Add support for GSBI11 for serial console"
ion: Update ION_SECURE and ION_FORCE_CONTIGUOUS flags

Rename ION_SECURE and ION_FORCE CONTIGUOUS to ION_FLAG_SECURE
and ION_FLAG_FORCE_CONTIGUOUS respectively, but leave the old
ones intact for backwards compatability.

Change-Id: I31ee3088ed202f60e14c10ac66d775c64c01c4e3
Signed-off-by: Adrian Alexei <aalexei@codeaurora.org>
msm: bam_dmux: Fix potential memory leaks

Added code to fix potential memory leaks.

Change-Id: I76f92fc95539feee67600a6ab4a730bbb50643a1
Signed-off-by: Brent Hronik <bhronik@codeaurora.org>
Merge "ASoC: msm: Add support to have FM playback through ASM loopback mode"
Merge "ASoC: msm: flush if prior and current backends rate not matching"
Merge "ASoC: msm: Handle data loss at device switch for FM"
Merge "ASoC: msm: Add msm-pcm-loopback device"