From 0061baa0819b7ffe6a86b32af904f52ffc4d306f Mon Sep 17 00:00:00 2001
From: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Date: Wed, 8 Mar 2017 18:47:50 -0800
Subject: [PATCH] ARM: dts: msm: Fix KPDPWR and KPDPWR_RESIN PON configuration
 in pm8998

As per the hardware documentation, configure S2 reset type for
KPDPWR_RESIN PON configuration to DVDD_HARD_RESET. Since KPDPWR
S1/S2 timer and S2 reset type is configured by bootloader for
the internal devices, HLOS doesn't need to configure it again.
Hence remove it.

CRs-Fixed: 2017642
Change-Id: I000953dba1fd138c1dbcbb94e15f95ac78a07acd
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
---
 arch/arm/boot/dts/qcom/msm-pm8998.dtsi | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/msm-pm8998.dtsi b/arch/arm/boot/dts/qcom/msm-pm8998.dtsi
index e91fc68d2c52..e13cdf4c28e7 100644
--- a/arch/arm/boot/dts/qcom/msm-pm8998.dtsi
+++ b/arch/arm/boot/dts/qcom/msm-pm8998.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,6 +12,7 @@
 
 #include <dt-bindings/spmi/spmi.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/msm/power-on.h>
 
 &spmi_bus {
 	qcom,pm8998@0 {
@@ -42,10 +43,6 @@
 				qcom,pon-type = <0>;
 				qcom,pull-up = <1>;
 				linux,code = <116>;
-				qcom,support-reset = <1>;
-				qcom,s1-timer = <10256>;
-				qcom,s2-timer = <2000>;
-				qcom,s2-type = <1>;
 			};
 
 			qcom,pon_2 {
@@ -60,7 +57,7 @@
 				qcom,pull-up = <1>;
 				qcom,s1-timer = <6720>;
 				qcom,s2-timer = <2000>;
-				qcom,s2-type = <7>;
+				qcom,s2-type = <PON_POWER_OFF_DVDD_HARD_RESET>;
 				qcom,use-bark;
 			};
 		};