diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-14 10:02:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-14 10:02:36 -0700 |
| commit | a6cfd0a6f411f42ec69128d4f864894bb1a57310 (patch) | |
| tree | c22f74d76fb25ab4d385431379a0a404c38e228a | |
| parent | d90306cf96b0222f47e10d61395303aa8d158717 (diff) | |
| parent | 0ae1ba07da10de410d24238d6e6f4f37628fedee (diff) | |
Merge "rtc: qpnp-rtc: Read ALARM_EN and update to alarm enabled status"
| -rw-r--r-- | drivers/rtc/qpnp-rtc.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/rtc/qpnp-rtc.c b/drivers/rtc/qpnp-rtc.c index a2c004e0f7fd..bafcebb810de 100644 --- a/drivers/rtc/qpnp-rtc.c +++ b/drivers/rtc/qpnp-rtc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2015, 2017-2018, 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 @@ -374,6 +374,15 @@ qpnp_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) alarm->time.tm_sec, alarm->time.tm_mday, alarm->time.tm_mon, alarm->time.tm_year); + rc = qpnp_read_wrapper(rtc_dd, value, + rtc_dd->alarm_base + REG_OFFSET_ALARM_CTRL1, 1); + if (rc) { + dev_err(dev, "Read from ALARM CTRL1 failed\n"); + return rc; + } + + alarm->enabled = !!(value[0] & BIT_RTC_ALARM_ENABLE); + return 0; } |