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

Commit 80b5edae 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: specify RESET_S3 source and timer for PMi8994 and PM8004"

parents 87c268a7 eca87426

arch/arm/boot/dts/qcom/msm-pm8004.dtsi

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -26,6 +26,8 @@ 
			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			qcom,secondary-pon-reset;

			qcom,s3-debounce = <16>;

			qcom,s3-src = "kpdpwr-and-resin";

		};



		qcom,temp-alarm@2400 {

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			qcom,secondary-pon-reset;

			qcom,s3-debounce = <16>;

			qcom,s3-src = "kpdpwr-and-resin";

		};



		pmi8994_gpios: gpios {