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

Commit 56d2e6c2 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 36e816f4 570a6d1c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ Optional properties:
- qcom,use-legacy-hard-reset-offset       Boolean property to support legacy
				hard-reset offset of the PON_RB_SPARE register for
				some (PON gen2) platforms.
- 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
+3 −0
Original line number Diff line number Diff line
@@ -494,3 +494,6 @@
	};
};

&pm6125_pon {
	qcom,log-kpd-event;
};
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,power-on@800 {
		pm6125_pon: qcom,power-on@800 {
			compatible = "qcom,qpnp-power-on";
			reg = <0x800>;
			interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>,