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

Commit c3d39c91 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: Add legacy hardware reset property for msm8909w"

parents f8af0249 9050ca25

Documentation/devicetree/bindings/input/qpnp-power-on.txt

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ Optional properties: 
				trigger during system shutdown case.

- qcom,ps-hold-hard-reset-disable	Boolean property to disable PS_HOLD

				POFF trigger during system hard reset case.

- 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.



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

node).

arch/arm64/boot/dts/qcom/8909w-pm660.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -326,6 +326,10 @@ 
		};

	};



	qcom,power-on@800 {

		qcom,use-legacy-hard-reset-offset;

	};



	pm660_rradc: rradc@4500 {

		compatible = "qcom,rradc";

		reg = <0x4500 0x100>;

drivers/input/misc/qpnp-power-on.c

+5 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ struct qpnp_pon { 
	bool			kpdpwr_dbc_enable;

	bool			resin_pon_reset;

	ktime_t			kpdpwr_last_release_time;

	bool			legacy_hard_reset_offset;

};



static int pon_ship_mode_en;
@@ -353,7 +354,7 @@ int qpnp_pon_set_restart_reason(enum pon_restart_reason reason) 
	if (!pon->store_hard_reset_reason)

		return 0;



	if (is_pon_gen2(pon))

	if (is_pon_gen2(pon) && !pon->legacy_hard_reset_offset)

		rc = qpnp_pon_masked_write(pon, QPNP_PON_SOFT_RB_SPARE(pon),

					   GENMASK(7, 1), (reason << 1));

	else
@@ -2524,6 +2525,9 @@ static int qpnp_pon_probe(struct platform_device *pdev) 
	pon->store_hard_reset_reason = of_property_read_bool(pdev->dev.of_node,

					"qcom,store-hard-reset-reason");



	pon->legacy_hard_reset_offset = of_property_read_bool(pdev->dev.of_node,

					"qcom,use-legacy-hard-reset-offset");



	qpnp_pon_debugfs_init(pdev);

	return 0;