diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-21 13:28:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-21 13:28:27 -0700 |
| commit | f098395d7dd40e5924c1ae6885027d874280551c (patch) | |
| tree | c1c3428585fcd145cbbd67881d3ea12340c0e9d8 /arch | |
| parent | 44df618d4fc0528de6682e865eb2b7055bd82c52 (diff) | |
| parent | 0061baa0819b7ffe6a86b32af904f52ffc4d306f (diff) | |
Merge "ARM: dts: msm: Fix KPDPWR and KPDPWR_RESIN PON configuration in pm8998"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pm8998.dtsi | 9 |
1 files 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; }; }; |