Merge "input: synaptics: update license and driver version"
Merge "input: synaptics_i2c_rmi4: Add regulator support"
Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
Merge "input: synaptics_i2c_rmi4: Add GPIO configuration support"
Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
Merge "input: synaptics_i2c_rmi4: Add device tree support"
Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
Merge "msm: camera: Camera sensor bringup on 8930 EVT SGLTE"
ASoC: Avoid putting stream state to STOP when stream paused

When multiple Front-end are using the same Back-end, putting
the stream state for a Front-end to STOP will make the the Backend
stream to be released, when the front-end is paused. This will avoid
the Backend to be released (when another active front-end stream is
present).
Instead, put the stream state to PAUSED, which will keep the Back-end
ON.

Change-Id: Ic31bf90a09b605b91f6b9fe3c09361b1145581fb
CRs-fixed: 428825
Signed-off-by: Banajit Goswami <bgoswa@codeaurora.org>
ASoC: WCD9304: Fix Headphone + Lineout concurrent audio playback

During concurrent playback on headphone and lineout, it is observed that
headphone is enabled in class G mode. This causes incorrect routing to
lineout. Fix by making sure headphone does not operate in class G mode
when there is concurrent playback on headphone and lineout.

CRs-fixed: 421247
Change-Id: Ib1f38deb453d6dbbcf86f69a117e6dc812b61546
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
msm: mdm2: Add delay between subsequent PS_HOLD

During SSR first a reset of external modem is issued
and mdm_do_soft_power_on() toggles ap2mdm_soft_reset which
in turn toogles the PS_HOLD. Then a part of SSR external
modem is powered up and mdm_do_soft_power_on() again toggles
the gpio. For PMIC register stabilization we need a 1sec delay
between subsequent mdm_do_soft_power_on().
By default the delay is 500msec, so adding another 500msec for
stablization.

Change-Id: I928c064f386c1e376fc5b0740c2d1336f549398f
Signed-off-by: Taniya Das <tdas@codeaurora.org>
8930: storage: add card detect support for QRD machine

8930 QRD platform seems to have different card detect GPIO
number compared to regular platforms like CDP/MTP/Fluid.
So this change makes use of the correct card detect GPIO
for QRD platforms.

Change-Id: I945795a56bd27c6ae7970fdf9cfb10691af910cc
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Merge "msm: mdm: Fix error value for SHUTDOWN_CHARM ioctl"
Conflicts:
	arch/arm/mach-msm/mdm_common.c
msm_fb: hdmi: Proper HPD state update

On switching off the HPD, we need to update the HPD state
after the polarity has been done to set the HPD state in
hardware properly.

CRs-Fixed: 465476
Change-Id: Ic0ba7fac72b8188c86a034ba9a45107689809028
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
msm_fb: Fix adb shell start/stop issue when bypass enabled

Currently when 2/3/4 layer bypass is enabled, doing a adb shell
stop/start is failing overlay and composition happens through
GPU. Fix this issue by proper overlay configuration during this
scenario.

Change-Id: Ia04f1839bf80ed552671e48445af63a4dcd6bdfd
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
power: bms: Report zero SOC if voltage is below cutoff

If the battery voltage remains below the cutoff threshold
for a specific period (determined by a platform data -
vbatt_cutoff_retries) report the SOC as 0. This allows
the userspace to perform a graceful shutdown. Also, provide
a platform data entry (low_voltage_detect) to enable this
functionality.
Enable 'low_voltage_detect' and set 'vbatt_cutoff_retries'
as required to enable the full functionality.

CRs-Fixed: 450387
Change-Id: I668d391cab3d0424fe5f370df0c1169124c34f5e
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
msm: ipc_logging: Update function stubs

If IPC Logging is not enabled, but is still used, then the stubs will be
multiply defined because they are not static inline.

Make the stubs static inline.

CR-fixed: 456106
Change-Id: Id39c8f27acb952228b40012726e6b761defd16fb
Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>
Signed-off-by: Arun Kumar Neelakatam <aneela@codeaurora.org>
msm: sglte2: prevent early bootup of the external qsc modem

The gpio connection to the KPD_PWR_N pin of the external qsc modem
is not inverted as it was in previous sglte targets so configuring
the gpio LOW initially was causing the qsc modem to boot up too
early. Change the configuration to HIGH and set the platform data
flag that tells the mdm driver that this connection is not inverted.

Change-Id: I240f056443aa2eb2fb2bfa192894054b610e91ff
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: timer: Use 32768Hz GPT and SCLK on 8064 family

On 8064 SOC family, a dedicated XO is derived to support
sleep clock at 32768Hz unlike 8960 SOC family where TCXO
divider was used with effective freq. of 32765Hz.

CRs-fixed: 462079
Change-Id: I79142703c4ffac209f4dedeefebc235eeb8b140d
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/timer.c
msm: mdm: add a parameter for the name used to register for SSR

The name that that mdm driver uses to register with SSR is used
by other drivers to register for notifications, so it must be a
system-wide, known string. The mdm driver was previously generating
an arbitrary string that only it knew about. The name needs to be
passed to the mdm driver instead of it being auto-generated.

Change-Id: If8dab185b5599e95f2087bab97d48e5c72311279
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: pm: Add regulator L9 for sglte support

Regulator L9 is used for audio in new sglte schematic.
Add regulator L9 support with 2.85V for audio.

Change-Id: Ia4b0c5bb95f9dbdaf65936ce55226552efbf8609
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.206'

Conflicts:
	arch/arm/mach-msm/board-8960.c

Change-Id: I7a70109ec4b9f7dc9eb7aaf793d1e164194bcc2a
Signed-off-by: Neha Pandey <nehap@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/include/mach/mdm2.h
	drivers/media/video/msm/Kconfig
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	include/linux/nl80211.h
	net/wireless/nl80211.c
	sound/soc/msm/msm8930.c
msm:rq_stats: Fix hotplug attribute during the suspend failure

If the system suspend fails, the hotplug_disable attribute remains
set. This prevents any change to core status from mpdecision. Reset
the value of this attribute if the module receives PM_POST_RESTORE
notification.

Change-Id: I22fd639134adbeb8f8f96603e285151480f537ec
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>