linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 3/6] rtc: mcp795: fix time range difference between linux and RTC chip.
Date: Thu,  8 Dec 2016 00:27:39 +0100	[thread overview]
Message-ID: <20cd15adcd8ffcf603987f6d928f6b7762eb1e58.1481151278.git.emilbart@gmail.com> (raw)
In-Reply-To: <cover.1481151278.git.emilbart@gmail.com>
In-Reply-To: <cover.1481151278.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.

Signed-off-by: Emil Bartczak <emilbart@gmail.com>
---
 drivers/rtc/rtc-mcp795.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 5fbdb4c..4618f4f 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -110,7 +110,7 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
 	data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min);
 	data[2] = bin2bcd(tim->tm_hour);
 	data[4] = bin2bcd(tim->tm_mday);
-	data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon);
+	data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon + 1);
 
 	if (tim->tm_year > 100)
 		tim->tm_year -= 100;
@@ -143,7 +143,7 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim)
 	tim->tm_min	= bcd2bin(data[1] & 0x7F);
 	tim->tm_hour	= bcd2bin(data[2] & 0x3F);
 	tim->tm_mday	= bcd2bin(data[4] & 0x3F);
-	tim->tm_mon	= bcd2bin(data[5] & 0x1F);
+	tim->tm_mon	= bcd2bin(data[5] & 0x1F) - 1;
 	tim->tm_year	= bcd2bin(data[6]) + 100; /* Assume we are in 20xx */
 
 	dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d %02d:%02d:%02d\n",
-- 
2.7.4

  parent reply	other threads:[~2016-12-07 23:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-07 23:27 [PATCH v2 0/6] Provides bug fixes for rtc-mcp795.c Emil Bartczak
2016-12-07 23:27 ` [PATCH v2 1/6] rtc: mcp795: use bcd2bin/bin2bcd Emil Bartczak
2016-12-07 23:27 ` [PATCH v2 2/6] rtc: mcp795: fix bitmask value for leap year (LP) Emil Bartczak
2016-12-07 23:27 ` Emil Bartczak [this message]
2016-12-07 23:27 ` [PATCH v2 4/6] rtc: mcp795: fix month write resetting date to 1 Emil Bartczak
2016-12-07 23:27 ` [PATCH v2 5/6] rtc: mcp795: Prefer using the BIT() macro Emil Bartczak
2016-12-07 23:27 ` [PATCH v2 6/6] rtc: mcp795: Fix whitespace and indentation Emil Bartczak
2016-12-08  0:34 ` [PATCH v2 0/6] Provides bug fixes for rtc-mcp795.c 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=20cd15adcd8ffcf603987f6d928f6b7762eb1e58.1481151278.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;
as well as URLs for NNTP newsgroup(s).