Skip to content

Commit

Permalink
rtc: mcp795: fix time range difference between linux and RTC chip.
Browse files Browse the repository at this point in the history 
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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
  • Loading branch information
Emil Bartczak authored and Alexandre Belloni committed Dec 18, 2016
1 parent e72765c commit 26eeefd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/rtc/rtc-mcp795.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 26eeefd

Please sign in to comment.