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

Commit f8792aca 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: Enable storing the hard-reset-reason"

parents 0d1ac106 b915d4d0

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

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

/* Copyright (c) 2014-2016, 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
@@ -32,6 +32,7 @@ 
			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,clear-warm-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,clear-warm-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -35,6 +35,7 @@ 
				"resin-bark", "kpdpwr-resin-bark";

			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;

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

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

/* Copyright (c) 2015-2016, 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
@@ -44,6 +44,7 @@ 
				"resin-bark", "kpdpwr-resin-bark";

			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -35,6 +35,7 @@ 
				"resin-bark", "kpdpwr-resin-bark";

			qcom,pon-dbc-delay = <15625>;

			qcom,system-reset;

			qcom,store-hard-reset-reason;



			qcom,pon_1 {

				qcom,pon-type = <0>;