From: Emil Bartczak <emilbart@gmail.com>
To: a.zummo@towertech.it
Cc: alexandre.belloni@free-electrons.com, rtc-linux@googlegroups.com,
linux-kernel@vger.kernel.org, Emil Bartczak <emilbart@gmail.com>
Subject: [PATCH 2/4] rtc: mcp795: fix time range difference between linux and RTC chip
Date: Mon, 5 Dec 2016 14:11:51 +0100 [thread overview]
Message-ID: <392135d01f90d405b3b5aceb6bcbb51ccf1be378.1480939487.git.emilbart@gmail.com> (raw)
In-Reply-To: <cover.1480939487.git.emilbart@gmail.com>
In-Reply-To: <cover.1480939487.git.emilbart@gmail.com>
In linux rtc_time struct, tm_mon range is 0~11, while in RTC HW REG,
month range is 1~12. This patch adjusts difference of them.
---
drivers/rtc/rtc-mcp795.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 266328b..d15072c 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -96,6 +96,7 @@ static int mcp795_rtcc_set_bits(struct device *dev, u8 addr, u8 mask, u8 state)
static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
{
+ int month;
int ret;
u8 data[7];
@@ -109,8 +110,9 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
data[1] = (data[1] & 0x80) | ((tim->tm_min / 10) << 4) | (tim->tm_min % 10);
data[2] = ((tim->tm_hour / 10) << 4) | (tim->tm_hour % 10);
data[4] = ((tim->tm_mday / 10) << 4) | ((tim->tm_mday) % 10);
+ month = tim->tm_mon + 1;
data[5] = (data[5] & MCP795_LP_BIT) |
- ((tim->tm_mon / 10) << 4) | (tim->tm_mon % 10);
+ ((month / 10) << 4) | (month % 10);
if (tim->tm_year > 100)
tim->tm_year -= 100;
@@ -143,7 +145,7 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim)
tim->tm_min = ((data[1] & 0x70) >> 4) * 10 + (data[1] & 0x0f);
tim->tm_hour = ((data[2] & 0x30) >> 4) * 10 + (data[2] & 0x0f);
tim->tm_mday = ((data[4] & 0x30) >> 4) * 10 + (data[4] & 0x0f);
- tim->tm_mon = ((data[5] & 0x10) >> 4) * 10 + (data[5] & 0x0f);
+ tim->tm_mon = ((data[5] & 0x10) >> 4) * 10 + (data[5] & 0x0f) - 1;
tim->tm_year = ((data[6] & 0xf0) >> 4) * 10 + (data[6] & 0x0f) + 100; /* Assume we are in 20xx */
dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d %02d:%02d:%02d\n",
--
2.7.4
next prev parent reply other threads:[~2016-12-05 13:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 13:11 [PATCH 0/4] Provides bug fixes for rtc-mcp795.c Emil Bartczak
2016-12-05 13:11 ` [PATCH 1/4] rtc: mcp795: fix invalid month setting Emil Bartczak
2016-12-05 15:09 ` Alexandre Belloni
2016-12-05 22:03 ` Emil Bartczak
2016-12-05 22:15 ` Alexandre Belloni
2016-12-05 22:31 ` Emil Bartczak
2016-12-05 13:11 ` Emil Bartczak [this message]
2016-12-05 13:11 ` [PATCH 3/4] rtc: mcp795: fix month write resetting date to 1 Emil Bartczak
2016-12-05 15:24 ` Alexandre Belloni
2016-12-05 22:16 ` Emil Bartczak
2016-12-05 22:47 ` Alexandre Belloni
2016-12-05 13:11 ` [PATCH 4/4] rtc: mcp795: use bcd2bin/bin2bcd Emil Bartczak
2016-12-05 15:27 ` 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=392135d01f90d405b3b5aceb6bcbb51ccf1be378.1480939487.git.emilbart@gmail.com \
--to=emilbart@gmail.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®