Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1538180

[PATCH v2 3/6] rtc: mcp795: fix time range difference between linux and RTC chip.

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/6] Provides bug fixes for rtc-mcp795.c Emil Bartczak <emilbart@gmail.com> - 2016-12-08 00:30 +0100
  [PATCH v2 4/6] rtc: mcp795: fix month write resetting date to 1. Emil Bartczak <emilbart@gmail.com> - 2016-12-08 00:30 +0100
  [PATCH v2 3/6] rtc: mcp795: fix time range difference between linux and RTC chip. Emil Bartczak <emilbart@gmail.com> - 2016-12-08 00:30 +0100
  [PATCH v2 5/6] rtc: mcp795: Prefer using the BIT() macro. Emil Bartczak <emilbart@gmail.com> - 2016-12-08 00:30 +0100
  [PATCH v2 1/6] rtc: mcp795: use bcd2bin/bin2bcd. Emil Bartczak <emilbart@gmail.com> - 2016-12-08 00:30 +0100
  Re: [PATCH v2 0/6] Provides bug fixes for rtc-mcp795.c Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-12-08 01:40 +0100

csiph-web