From: "Benoît Thébaudeau" <benoit@wsystem.com>
To: rtc-linux@googlegroups.com
Cc: linux-kernel@vger.kernel.org,
"Alessandro Zummo" <a.zummo@towertech.it>,
"Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
"Benoît Thébaudeau" <benoit@wsystem.com>
Subject: [rtc-linux] [PATCH 3/6] rtc: rv8803: Fix read day of week
Date: Thu, 21 Jul 2016 12:41:29 +0200 [thread overview]
Message-ID: <1469097692-103146-3-git-send-email-benoit@wsystem.com> (raw)
In-Reply-To: <1469097692-103146-1-git-send-email-benoit@wsystem.com>
The Weekday register is encoded as 2^tm_wday, with tm_wday in 0..6, so
using tm_wday =3D ffs(reg) to fill tm_wday from the register value is
wrong because this gives the expected value + 1. This could be fixed as
tm_wday =3D ffs(reg) - 1, but tm_wday =3D ilog2(reg) works as well and is
more direct.
Signed-off-by: Beno=C3=AEt Th=C3=A9baudeau <benoit@wsystem.com>
---
drivers/rtc/rtc-rv8803.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index e740c83..aa1d6b6 100644
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -13,6 +13,7 @@
=20
#include <linux/bcd.h>
#include <linux/bitops.h>
+#include <linux/log2.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
@@ -145,7 +146,7 @@ static int rv8803_get_time(struct device *dev, struct r=
tc_time *tm)
tm->tm_sec =3D bcd2bin(date[RV8803_SEC] & 0x7f);
tm->tm_min =3D bcd2bin(date[RV8803_MIN] & 0x7f);
tm->tm_hour =3D bcd2bin(date[RV8803_HOUR] & 0x3f);
- tm->tm_wday =3D ffs(date[RV8803_WEEK] & 0x7f);
+ tm->tm_wday =3D ilog2(date[RV8803_WEEK] & 0x7f);
tm->tm_mday =3D bcd2bin(date[RV8803_DAY] & 0x3f);
tm->tm_mon =3D bcd2bin(date[RV8803_MONTH] & 0x1f) - 1;
tm->tm_year =3D bcd2bin(date[RV8803_YEAR]) + 100;
--=20
2.5.0
--=20
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---=20
You received this message because you are subscribed to the Google Groups "=
rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an e=
mail to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
WARNING: multiple messages have this Message-ID (diff)
From: "Benoît Thébaudeau" <benoit@wsystem.com>
To: rtc-linux@googlegroups.com
Cc: linux-kernel@vger.kernel.org,
"Alessandro Zummo" <a.zummo@towertech.it>,
"Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
"Benoît Thébaudeau" <benoit@wsystem.com>
Subject: [PATCH 3/6] rtc: rv8803: Fix read day of week
Date: Thu, 21 Jul 2016 12:41:29 +0200 [thread overview]
Message-ID: <1469097692-103146-3-git-send-email-benoit@wsystem.com> (raw)
In-Reply-To: <1469097692-103146-1-git-send-email-benoit@wsystem.com>
The Weekday register is encoded as 2^tm_wday, with tm_wday in 0..6, so
using tm_wday = ffs(reg) to fill tm_wday from the register value is
wrong because this gives the expected value + 1. This could be fixed as
tm_wday = ffs(reg) - 1, but tm_wday = ilog2(reg) works as well and is
more direct.
Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
---
drivers/rtc/rtc-rv8803.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index e740c83..aa1d6b6 100644
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -13,6 +13,7 @@
#include <linux/bcd.h>
#include <linux/bitops.h>
+#include <linux/log2.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
@@ -145,7 +146,7 @@ static int rv8803_get_time(struct device *dev, struct rtc_time *tm)
tm->tm_sec = bcd2bin(date[RV8803_SEC] & 0x7f);
tm->tm_min = bcd2bin(date[RV8803_MIN] & 0x7f);
tm->tm_hour = bcd2bin(date[RV8803_HOUR] & 0x3f);
- tm->tm_wday = ffs(date[RV8803_WEEK] & 0x7f);
+ tm->tm_wday = ilog2(date[RV8803_WEEK] & 0x7f);
tm->tm_mday = bcd2bin(date[RV8803_DAY] & 0x3f);
tm->tm_mon = bcd2bin(date[RV8803_MONTH] & 0x1f) - 1;
tm->tm_year = bcd2bin(date[RV8803_YEAR]) + 100;
--
2.5.0
next prev parent reply other threads:[~2016-07-21 10:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 10:41 [rtc-linux] [PATCH 1/6] rtc: rv8803: Kconfig: Indicate rx8900 support Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau
2016-07-21 10:41 ` [rtc-linux] [PATCH 2/6] rtc: rv8803: Remove the check for valid time Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau [this message]
2016-07-21 10:41 ` [PATCH 3/6] rtc: rv8803: Fix read day of week Benoît Thébaudeau
2016-07-21 10:41 ` [rtc-linux] [PATCH 4/6] rtc: rv8803: Always apply the I²C workaround Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau
2016-07-21 11:10 ` [rtc-linux] " Alexandre Belloni
2016-07-21 11:10 ` Alexandre Belloni
2016-07-21 12:34 ` [rtc-linux] " Benoît Thébaudeau
2016-07-21 12:34 ` Benoît Thébaudeau
2016-07-21 18:30 ` [rtc-linux] " Benoît Thébaudeau
2016-07-21 18:30 ` Benoît Thébaudeau
2016-07-21 10:41 ` [rtc-linux] [PATCH 5/6] rtc: rv8803: Stop the clock while setting the time Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau
2016-07-21 10:41 ` [rtc-linux] [PATCH 6/6] rtc: rv8803: Clear V1F when " Benoît Thébaudeau
2016-07-21 10:41 ` Benoît Thébaudeau
2016-07-28 8:00 ` [rtc-linux] Re: [PATCH 1/6] rtc: rv8803: Kconfig: Indicate rx8900 support Alexandre Belloni
2016-07-28 8:00 ` 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=1469097692-103146-3-git-send-email-benoit@wsystem.com \
--to=benoit@wsystem.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.