aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Bartczak <emilbart@gmail.com>2016-12-07 18:27:38 -0500
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-12-18 18:59:22 -0500
commite72765c648a172f052486cba9688ddc28f23140b (patch)
tree121024aa765aeb76c0bc4fc2b646334d91122372
parentbcf18d88ac16c1a86bac7e8f5f4b1de1f752865f (diff)
rtc: mcp795: fix bitmask value for leap year (LP).
According the datasheet the leap year is a fifth bit in month register. Signed-off-by: Emil Bartczak <emilbart@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
-rw-r--r--drivers/rtc/rtc-mcp795.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 0389ee03c660..5fbdb4c20a9b 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -40,6 +40,7 @@
40 40
41#define MCP795_ST_BIT 0x80 41#define MCP795_ST_BIT 0x80
42#define MCP795_24_BIT 0x40 42#define MCP795_24_BIT 0x40
43#define MCP795_LP_BIT BIT(5)
43 44
44static int mcp795_rtcc_read(struct device *dev, u8 addr, u8 *buf, u8 count) 45static int mcp795_rtcc_read(struct device *dev, u8 addr, u8 *buf, u8 count)
45{ 46{
@@ -109,7 +110,7 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
109 data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min); 110 data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min);
110 data[2] = bin2bcd(tim->tm_hour); 111 data[2] = bin2bcd(tim->tm_hour);
111 data[4] = bin2bcd(tim->tm_mday); 112 data[4] = bin2bcd(tim->tm_mday);
112 data[5] = (data[5] & 0x10) | bin2bcd(tim->tm_mon); 113 data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon);
113 114
114 if (tim->tm_year > 100) 115 if (tim->tm_year > 100)
115 tim->tm_year -= 100; 116 tim->tm_year -= 100;