Merge "rtc: qpnp-rtc: Sets RTC time correctly" (857babaf) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/rtc/qpnp-rtc.c

+32 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -102,6 +102,7 @@ qpnp_rtc_set_time(struct device dev, struct rtc_time tm)
		int rc;
		unsigned long secs, irq_flags;
		u8 value[4], reg = 0, alarm_enabled = 0, ctrl_reg;
		u8 rtc_disabled = 0, rtc_ctrl_reg;
		struct qpnp_rtc *rtc_dd = dev_get_drvdata(dev);

		rtc_tm_to_time(tm, &secs);
		@@ -152,6 +153,22 @@ qpnp_rtc_set_time(struct device dev, struct rtc_time tm)
		* write operation
		*/

		/* Disable RTC H/w before writing on RTC register*/
		rtc_ctrl_reg = rtc_dd->rtc_ctrl_reg;
		if (rtc_ctrl_reg & BIT_RTC_ENABLE) {
		rtc_disabled = 1;
		rtc_ctrl_reg &= ~BIT_RTC_ENABLE;
		rc = qpnp_write_wrapper(rtc_dd, &rtc_ctrl_reg,
		rtc_dd->rtc_base + REG_OFFSET_RTC_CTRL, 1);
		if (rc) {
		dev_err(dev,
		"Disabling of RTC control reg failed"
		" with error:%d\n", rc);
		goto rtc_rw_fail;
		}
		rtc_dd->rtc_ctrl_reg = rtc_ctrl_reg;
		}

		/* Clear WDATA[0] */
		reg = 0x0;
		rc = qpnp_write_wrapper(rtc_dd, &reg,
		@@ -177,6 +194,20 @@ qpnp_rtc_set_time(struct device dev, struct rtc_time tm)
		goto rtc_rw_fail;
		}

		/* Enable RTC H/w after writing on RTC register*/
		if (rtc_disabled) {
		rtc_ctrl_reg \|= BIT_RTC_ENABLE;
		rc = qpnp_write_wrapper(rtc_dd, &rtc_ctrl_reg,
		rtc_dd->rtc_base + REG_OFFSET_RTC_CTRL, 1);
		if (rc) {
		dev_err(dev,
		"Enabling of RTC control reg failed"
		" with error:%d\n", rc);
		goto rtc_rw_fail;
		}
		rtc_dd->rtc_ctrl_reg = rtc_ctrl_reg;
		}

		if (alarm_enabled) {
		ctrl_reg \|= BIT_RTC_ALARM_ENABLE;
		rc = qpnp_write_wrapper(rtc_dd, &ctrl_reg,