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

Commit 8d822358 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: Disable CBLPWR_N trigger on DB410c"

parents 8f12234f 462fe40e

Documentation/devicetree/bindings/platform/msm/qpnp-power-on.txt

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ Optional properties: 
- qcom,store-hard-reset-reason	Boolean property which if set will store the hardware

				reset reason to SOFT_RB_SPARE register of the core PMIC

				PON peripheral.

- qcom,pon-reset-off		Boolean property which if set will store the hardware

				power off in the system shut-down state, instead of a reset-state.



All the below properties are in the sub-node section (properties of the child

node).

arch/arm/boot/dts/qcom/apq8016-sbc.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ 
			};

		};

		pm8916_pon: qcom,power-on@800 {

			qcom,pon-reset-off;

			qcom,pon_1 {

				qcom,s2-type = <7>;

			};

drivers/platform/msm/qpnp-power-on.c

+9 −0
Original line number Diff line number Diff line
@@ -1679,6 +1679,15 @@ static int qpnp_pon_probe(struct spmi_device *spmi) 
		return rc;

	}



	if (of_property_read_bool(spmi->dev.of_node,

					"qcom,pon-reset-off")) {

		rc = qpnp_pon_trigger_config(PON_CBLPWR_N, false);

		if (rc) {

			dev_err(&spmi->dev, "failed update the PON_CBLPWR %d\n",

				rc);

		}

	}



	/* config whether store the hard reset reason */

	pon->store_hard_reset_reason = of_property_read_bool(

					spmi->dev.of_node,