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

Commit 1d6ad831 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable KPDPWR status logging"

parents 1a0a2bba df665e9f

bindings/input/qpnp-power-on.txt

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ Optional properties: 
				power off trigger during system shutdown case.

- qcom,ps-hold-hard-reset-disable:	Boolean property to disable PS_HOLD

				power off trigger during system hard reset case.

- qcom,log-kpd-event:		Boolean property to enable logging of KPDPWR status

				during driver INIT and runtime when key is pressed.



Optional Sub-nodes:

- qcom,pon_1 ... qcom,pon_n:	These PON child nodes correspond to features

qcom/khaje-pm7250b.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -87,3 +87,7 @@ 
		};

	};

};



&pm7250b_pon {

	qcom,log-kpd-event;

};

qcom/pm7250b.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
			reg = <0x100 0x100>;

		};



		qcom,power-on@800 {

		pm7250b_pon: qcom,power-on@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

		};