Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 989e8eeb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Fix KPDPWR and KPDPWR_RESIN PON configuration in pm8998" into msm-4.9

parents b36d5f3d d5d4e7b0

arch/arm64/boot/dts/qcom/pm8998.dtsi

+2 −5
Original line number Diff line number Diff line
@@ -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;

			};

		};