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

Commit 6c20e1c5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: qpnp-power-on: Store device shut down in PMIC register"

parents 0a1f6301 dcbef2a1

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,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 reset state.

- qcom,warm-reset-poweroff-type		Poweroff type required to be configured on

					PS_HOLD reset control register when the system

					goes for warm reset. If this property is not

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

+9 −0
Original line number Diff line number Diff line
@@ -2251,6 +2251,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);

		}

	}



	if (of_property_read_bool(spmi->dev.of_node,

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

		if (sys_reset) {