From: "Mylène Josserand" <mylene.josserand@free-electrons.com>
To: alexandre.belloni@free-electrons.com, rtc-linux@googlegroups.com
Cc: Alessandro Zummo <a.zummo@towertech.it>,
linux-kernel@vger.kernel.org,
mylene.josserand@free-electrons.com
Subject: [PATCH V3 5/7] rtc: rv3029: fix alarm support
Date: Tue, 3 May 2016 11:54:36 +0200 [thread overview]
Message-ID: <7ae6fa71518f6df8eec00a5784b437a80436d0c1.1462268107.git.mylene.josserand@free-electrons.com> (raw)
In-Reply-To: <cover.1462268107.git.mylene.josserand@free-electrons.com>
In-Reply-To: <cover.1462268107.git.mylene.josserand@free-electrons.com>
The RTC RV3029 handles different types of alarms : seconds, minutes, ...
These alarms can be enabled or disabled individually using an AE_x bit
which is the last bit (BIT(7)) on each alarm registers.
To prepare the alarm IRQ support, the current code enables all the alarm
types by setting each AE_x to 1.
It also fixes others alarms issues :
- month and weekday errors : it was performing -1 instead of +1.
- wrong use of bit mask with bin2bcd
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
drivers/rtc/rtc-rv3029c2.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index cf8d465..88a0c18 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -76,6 +76,7 @@
#define RV3029_A_DW 0x14
#define RV3029_A_MO 0x15
#define RV3029_A_YR 0x16
+#define RV3029_A_AE_X BIT(7)
#define RV3029_ALARM_SECTION_LEN 0x07
/* timer section */
@@ -436,14 +437,22 @@ static int rv3029_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
dev_err(dev, "%s: reading SR failed\n", __func__);
return -EIO;
}
- regs[RV3029_A_SC - RV3029_A_SC] = bin2bcd(tm->tm_sec & 0x7f);
- regs[RV3029_A_MN - RV3029_A_SC] = bin2bcd(tm->tm_min & 0x7f);
- regs[RV3029_A_HR - RV3029_A_SC] = bin2bcd(tm->tm_hour & 0x3f);
- regs[RV3029_A_DT - RV3029_A_SC] = bin2bcd(tm->tm_mday & 0x3f);
- regs[RV3029_A_MO - RV3029_A_SC] = bin2bcd((tm->tm_mon & 0x1f) - 1);
- regs[RV3029_A_DW - RV3029_A_SC] = bin2bcd((tm->tm_wday & 7) - 1);
- regs[RV3029_A_YR - RV3029_A_SC] = bin2bcd((tm->tm_year & 0x7f) - 100);
+ /* Activate all the alarms with AE_x bit */
+ regs[RV3029_A_SC - RV3029_A_SC] = bin2bcd(tm->tm_sec) | RV3029_A_AE_X;
+ regs[RV3029_A_MN - RV3029_A_SC] = bin2bcd(tm->tm_min) | RV3029_A_AE_X;
+ regs[RV3029_A_HR - RV3029_A_SC] = (bin2bcd(tm->tm_hour) & 0x3f)
+ | RV3029_A_AE_X;
+ regs[RV3029_A_DT - RV3029_A_SC] = (bin2bcd(tm->tm_mday) & 0x3f)
+ | RV3029_A_AE_X;
+ regs[RV3029_A_MO - RV3029_A_SC] = (bin2bcd(tm->tm_mon + 1) & 0x1f)
+ | RV3029_A_AE_X;
+ regs[RV3029_A_DW - RV3029_A_SC] = (bin2bcd(tm->tm_wday + 1) & 0x7)
+ | RV3029_A_AE_X;
+ regs[RV3029_A_YR - RV3029_A_SC] = (bin2bcd(tm->tm_year - 100))
+ | RV3029_A_AE_X;
+
+ /* Write the alarm */
ret = rv3029_write_regs(dev, RV3029_A_SC, regs,
RV3029_ALARM_SECTION_LEN);
if (ret < 0)
--
2.8.0.rc3
next prev parent reply other threads:[~2016-05-03 9:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 9:54 [PATCH V3 0/7] add support for Microcrystal RV-3049 Mylène Josserand
2016-05-03 9:54 ` [PATCH V3 1/7] rtc: rv3029: remove 'i2c' in functions names Mylène Josserand
2016-05-03 9:54 ` [PATCH V3 2/7] rtc: rv3029: convert to use regmap Mylène Josserand
2016-05-03 9:54 ` [PATCH V3 3/7] rtc: rv3029: Add support of RV3049 Mylène Josserand
2016-05-03 9:54 ` [PATCH V3 4/7] rtc: rv3029: Remove some checks and warnings Mylène Josserand
2016-05-03 9:54 ` Mylène Josserand [this message]
2016-05-03 9:54 ` [PATCH V3 6/7] rtc: rv3029: fix set_time function Mylène Josserand
2016-05-03 9:54 ` [PATCH V3 7/7] rtc: rv3029: add alarm IRQ Mylène Josserand
2016-05-03 12:35 ` [PATCH V3 0/7] add support for Microcrystal RV-3049 Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ae6fa71518f6df8eec00a5784b437a80436d0c1.1462268107.git.mylene.josserand@free-electrons.com \
--to=mylene.josserand@free-electrons.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®