Merge "platform: qpnp-power-on: Update the PON subtype check" (2d42450c) · Commits · e / devices / android_kernel_xiaomi_markw

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

+28 −9

Original line number	Diff line number	Diff line
		@@ -42,10 +42,15 @@
		#define PMIC8941_V1_REV4 0x01
		#define PMIC8941_V2_REV4 0x02
		#define PON_PRIMARY 0x01
		#define PON_SECONDARY 0x02
		#define PON_1REG 0x03
		#define PON_GEN2_PRIMARY 0x04
		#define PON_GEN2_SECONDARY 0x05

		#define PON_OFFSET(subtype, offset_gen1, offset_gen2) \
		(subtype == PON_PRIMARY ? offset_gen1 : offset_gen2)
		(((subtype == PON_PRIMARY) \|\| \
		(subtype == PON_SECONDARY) \|\| \
		(subtype == PON_1REG)) ? offset_gen1 : offset_gen2)

		/* Common PNP defines */
		#define QPNP_PON_REVISION2(pon) ((pon)->base + 0x01)
		@@ -235,7 +240,7 @@ static const char * const qpnp_pon_reason[] = {
		#define POFF_REASON_FAULT_OFFSET 16
		#define POFF_REASON_S3_RESET_OFFSET 32
		static const char * const qpnp_poff_reason[] = {
		/* QPNP_PON_PRIMARY POFF reasons */
		/* QPNP_PON_GEN1 POFF reasons */
		[0] = "Triggered from SOFT (Software)",
		[1] = "Triggered from PS_HOLD (PS_HOLD/MSM controlled shutdown)",
		[2] = "Triggered from PMIC_WD (PMIC watchdog)",
		@@ -315,6 +320,18 @@ qpnp_pon_masked_write(struct qpnp_pon *pon, u16 addr, u8 mask, u8 val)
		return rc;
		}

		static bool is_pon_gen1(struct qpnp_pon *pon)
		{
		return pon->subtype == PON_PRIMARY \|\|
		pon->subtype == PON_SECONDARY;
		}

		static bool is_pon_gen2(struct qpnp_pon *pon)
		{
		return pon->subtype == PON_GEN2_PRIMARY \|\|
		pon->subtype == PON_GEN2_SECONDARY;
		}

		/**
		* qpnp_pon_set_restart_reason - Store device restart reason in PMIC register.
		*
		@@ -551,7 +568,7 @@ int qpnp_pon_is_warm_reset(void)
		if (!pon)
		return -EPROBE_DEFER;

		if (pon->subtype == PON_PRIMARY)
		if (is_pon_gen1(pon) \|\| pon->subtype == PON_1REG)
		return pon->warm_reset_reason1
		\|\| (pon->warm_reset_reason2 & QPNP_PON_WARM_RESET_TFT);
		else
		@@ -608,7 +625,7 @@ int qpnp_pon_trigger_config(enum pon_trigger_source pon_src, bool enable)
		return -EINVAL;
		}

		if (pon->subtype == PON_GEN2_PRIMARY && pon_src == PON_SMPL) {
		if (is_pon_gen2(pon) && pon_src == PON_SMPL) {
		rc = qpnp_pon_masked_write(pon, QPNP_PON_SMPL_CTL(pon),
		QPNP_PON_SMPL_EN, enable ? QPNP_PON_SMPL_EN : 0);
		if (rc)
		@@ -645,7 +662,7 @@ static int qpnp_pon_store_and_clear_warm_reset(struct qpnp_pon *pon)
		return rc;
		}

		if (pon->subtype == PON_PRIMARY) {
		if (is_pon_gen1(pon) \|\| pon->subtype == PON_1REG) {
		rc = spmi_ext_register_readl(pon->spmi->ctrl, pon->spmi->sid,
		QPNP_PON_WARM_RESET_REASON2(pon),
		&pon->warm_reset_reason2, 1);
		@@ -827,7 +844,7 @@ static irqreturn_t qpnp_pmic_wd_bark_irq(int irq, void *_pon)
		print_pon_reg(pon, PON_WARM_RESET_REASON1(pon->subtype));
		print_pon_reg(pon, PON_SOFT_RESET_REASON1(pon->subtype));
		print_pon_reg(pon, PON_POFF_REASON1(pon->subtype));
		if (pon->subtype == PON_PRIMARY) {
		if (is_pon_gen1(pon) \|\| pon->subtype == PON_1REG) {
		print_pon_reg(pon, PON_PON_REASON2);
		print_pon_reg(pon, PON_WARM_RESET_REASON2);
		print_pon_reg(pon, PON_POFF_REASON2);
		@@ -1913,13 +1930,15 @@ static int qpnp_pon_probe(struct spmi_device *spmi)
		QPNP_PON_REVISION2(pon), rc);
		return rc;
		}
		if (pon->subtype == PON_PRIMARY) {
		if (is_pon_gen1(pon)) {
		if (pon->pon_ver == 0)
		pon->pon_ver = QPNP_PON_GEN1_V1;
		else
		pon->pon_ver = QPNP_PON_GEN1_V2;
		} else if (pon->subtype == PON_GEN2_PRIMARY) {
		} else if (is_pon_gen2(pon)) {
		pon->pon_ver = QPNP_PON_GEN2;
		} else if (pon->subtype == PON_1REG) {
		pon->pon_ver = QPNP_PON_GEN1_V2;
		} else {
		dev_err(&pon->spmi->dev,
		"Invalid PON_PERPH_SUBTYPE value %x\n",
		@@ -1962,7 +1981,7 @@ static int qpnp_pon_probe(struct spmi_device *spmi)
		}

		/* POFF reason */
		if (pon->subtype != PON_PRIMARY) {
		if (!is_pon_gen1(pon) && pon->subtype != PON_1REG) {
		rc = read_gen2_pon_off_reason(pon, &poff_sts,
		&reason_index_offset);
		if (rc)