Merge "rtc: qpnp-rtc: Set alarm control register properly" (22b9645b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/rtc/qpnp-rtc.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -563,8 +563,15 @@ static int qpnp_rtc_probe(struct spmi_device *spmi)
	goto fail_rtc_enable;		goto fail_rtc_enable;
	}		}

			rc = qpnp_read_wrapper(rtc_dd, &rtc_dd->alarm_ctrl_reg1,
			rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1);
			if (rc) {
			dev_err(&spmi->dev,
			"Read from Alarm control reg failed\n");
			goto fail_rtc_enable;
			}
	/* Enable abort enable feature */		/* Enable abort enable feature */
	rtc_dd->alarm_ctrl_reg1 = BIT_RTC_ABORT_ENABLE;		rtc_dd->alarm_ctrl_reg1 \|= BIT_RTC_ABORT_ENABLE;
	rc = qpnp_write_wrapper(rtc_dd, &rtc_dd->alarm_ctrl_reg1,		rc = qpnp_write_wrapper(rtc_dd, &rtc_dd->alarm_ctrl_reg1,
	rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1);		rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1);
	if (rc) {		if (rc) {