SQUASH qpnp stuff

msm: qpnp-power-on: Add API to reset and shutdown the system

Add an API to allow the system to reset or shutdown, depending on
the parameter passed. The qpnp-power-on driver supports any number
of PON devices, but only one device is permissible to reset the
device. Introduce a new Device Tree binding to indicate which
device should be responsible for this resetting the system.

Change-Id: I4086b50402a5c997fb0efada3e65116eec8f4e53
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
(cherry picked from commit 6e34b5121de2ff881cb432e23eec857c168c1314)
Signed-off-by: thirdzcee <thirdzcee@gmail.com>

msm: qpnp-power-on: Add API to detect warm reset

Add an API to allow consumers to know whether the PMIC went through
a warm or cold boot. This currently only checks the PON device that
allows resets.

Change-Id: Id145ec62bbdf0e4988476f2c2084f92c3f588209
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
(cherry picked from commit 6cc3271dd893a71b293f456f3755d38d4aa943ba)
Signed-off-by: thirdzcee <thirdzcee@gmail.com>

Conflicts:
	drivers/platform/msm/qpnp-power-on.c

msm: qpnp-pon: Add API to configure the PON trigger source

The API enables/disables power-on trigger capability of a PON source.
If a specific PON trigger is disabled it cannot act as a power-on
source to the PMIC.

CRs-Fixed: 489577
Change-Id: Ibec2063215eafc47701a3e255849e16f1d7b2cee
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
(cherry picked from commit d73f989ff223a07fa60981c7b05793e7dade2574)
Signed-off-by: thirdzcee <thirdzcee@gmail.com>

Conflicts:
	drivers/platform/msm/qpnp-power-on.c

msm: qpnp-power-on: Add finer control of PMIC power off type

Modify the qpnp_pon_system_pwr_off() function so that different
types of PMIC reset may be requested.  In particular, add support
so that both warm and hard reset may be used.  Warm reset
maintains the hardware state of some PMIC peripherals.  Hard
reset resets all PMIC peripherals.

Change-Id: Ibe1491acfe90364e96b776d26e158522dfea9c2b
CRs-Fixed: 507850
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit 06b96aa19e77ddeccacb1f5815ac781b963e971c)
Signed-off-by: thirdzcee <thirdzcee@gmail.com>

Conflicts:
	arch/arm/mach-msm/restart.c
s2w/dt2w:prevent touches during phone call

Signed-off-by: thirdzcee <thirdzcee@gmail.com>