Merge "platform: qpnp-power-on: remove S2 reset for CBLPWR"

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1170,7 +1170,7 @@ static int qpnp_pon_config_init(struct qpnp_pon *pon)
		"Unable to config pon reset\n");
		goto unreg_input_dev;
		}
		} else {
		} else if (cfg->pon_type != PON_CBLPWR) {
		/* disable S2 reset */
		rc = qpnp_pon_masked_write(pon, cfg->s2_cntl2_addr,
		QPNP_PON_S2_CNTL_EN, 0);