commit 2a776b65b06df0caf130fda99b2e10806f0b6701
author Linux Build Service Account <lnxbuild@localhost> Sat Jul 13 03:30:41 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jul 13 03:30:40 2013 -0700
tree 6855216f3c06e9335c94722d517b2c45add87531
parent c32c7c621f214dd622385d86a778fa3ae94d5003
parent 1acc092e79d966b10fca26019dd9742f55630123

Merge "ARM: dts: msm: set the resume soc to 99 for pm8226 and pm8110"

arch/arm/boot/dts/msm-pm8110.dtsi

diff --git a/arch/arm/boot/dts/msm-pm8110.dtsi b/arch/arm/boot/dts/msm-pm8110.dtsi
index 0e446e2..0032c98 100644
--- a/arch/arm/boot/dts/msm-pm8110.dtsi
+++ b/arch/arm/boot/dts/msm-pm8110.dtsi
@@ -66,6 +66,7 @@
 			qcom,ibatsafe-ma = <1500>;
 			qcom,thermal-mitigation = <1500 700 600 325>;
 			qcom,vbatdet-delta-mv = <350>;
+			qcom,resume-soc = <99>;
 			qcom,tchg-mins = <150>;
 
 			qcom,chgr@1000 {

arch/arm/boot/dts/msm-pm8226.dtsi

diff --git a/arch/arm/boot/dts/msm-pm8226.dtsi b/arch/arm/boot/dts/msm-pm8226.dtsi
index 0f93c8e..d7c2155 100644
--- a/arch/arm/boot/dts/msm-pm8226.dtsi
+++ b/arch/arm/boot/dts/msm-pm8226.dtsi
@@ -81,6 +81,7 @@
 			qcom,ibatterm-ma = <100>;
 			qcom,ibatsafe-ma = <1500>;
 			qcom,thermal-mitigation = <1500 700 600 325>;
+			qcom,resume-soc = <99>;
 			qcom,tchg-mins = <150>;
 
 			qcom,chgr@1000 {