diff options
| author | Chenglu Lin <chenglulin@google.com> | 2019-05-23 16:16:10 +0800 |
|---|---|---|
| committer | Chenglu Lin <chenglulin@google.com> | 2019-05-23 16:17:48 +0800 |
| commit | b3668ca2041748a3d2e2f712a9e23141bf4a55f7 (patch) | |
| tree | 863ee57d79469a81e9de2d213962e15b674c8ca4 | |
| parent | 7ca7e4d1d2e672750bb9c9268e20dec199591fba (diff) | |
ARM: dts: b4s4: Remove S1/S2 timer and S2 reset type settingsandroid-9.0.0_r0.100
Since KPDPWR S1/S2 timer and S2 reset type is configured by bootloader,
HLOS doesn't need to configure it again.
Bug: 133150859
Change-Id: Ib6b04cf8ba1e02d2e5eea81ccbed5524ec8d18ba
Signed-off-by: Chenglu Lin <chenglulin@google.com>
| -rw-r--r-- | arch/arm64/boot/dts/google/sdm670-b4s4-common.dtsi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/google/sdm670-b4s4-common.dtsi b/arch/arm64/boot/dts/google/sdm670-b4s4-common.dtsi index 627a1a027b88..6b013ccc3633 100644 --- a/arch/arm64/boot/dts/google/sdm670-b4s4-common.dtsi +++ b/arch/arm64/boot/dts/google/sdm670-b4s4-common.dtsi @@ -23,6 +23,7 @@ #include <dt-bindings/regulator/qcom,rpmh-regulator.h> #include <dt-bindings/clock/mdss-10nm-pll-clk.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/msm/power-on.h> #include "../qcom/sdm670-pmic-overlay.dtsi" #include "sdm670-b4s4-display.dtsi" @@ -324,10 +325,6 @@ interrupt-names = "kpdpwr", "resin", "kpdpwr-bark", "resin-bark", "kpdpwr-resin-bark"; qcom,pon_1 { - qcom,support-reset = <1>; - qcom,s1-timer = <10256>; - qcom,s2-timer = <2000>; - qcom,s2-type = <1>; qcom,use-bark; }; qcom,pon_2 { @@ -338,7 +335,7 @@ qcom,support-reset = <1>; qcom,s1-timer = <10256>; qcom,s2-timer = <2000>; - qcom,s2-type = <8>; + qcom,s2-type = <PON_POWER_OFF_DVDD_HARD_RESET>; qcom,pull-up = <1>; }; }; |