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

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

Merge "platform: msm: fix s3 source macros"

parents af5fe375 a4c9d034

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

+5 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ 


#define QPNP_PON_S3_SRC_KPDPWR			0

#define QPNP_PON_S3_SRC_RESIN			1

#define QPNP_PON_S3_SRC_KPDPWR_OR_RESIN		2

#define QPNP_PON_S3_SRC_KPDPWR_AND_RESIN	3

#define QPNP_PON_S3_SRC_KPDPWR_AND_RESIN	2

#define QPNP_PON_S3_SRC_KPDPWR_OR_RESIN		3

#define QPNP_PON_S3_SRC_MASK			0x3



/* Ranges */
@@ -1382,6 +1382,9 @@ static int qpnp_pon_probe(struct spmi_device *spmi) 
	else /* default combination */

		s3_src_reg = QPNP_PON_S3_SRC_KPDPWR_AND_RESIN;



	/* S3 source is a write once register. If the register has

	 * been configured by bootloader then this operation will

	 * not be effective. */

	rc = qpnp_pon_masked_write(pon, QPNP_PON_S3_SRC(pon->base),

			QPNP_PON_S3_SRC_MASK, s3_src_reg);

	if (rc) {