]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
rtc: mcp795: fix bitmask value for leap year (LP).
authorEmil Bartczak <emilbart@gmail.com>
Wed, 7 Dec 2016 23:27:38 +0000 (00:27 +0100)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Sun, 18 Dec 2016 23:59:22 +0000 (00:59 +0100)
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>
drivers/rtc/rtc-mcp795.c

index 0389ee03c66050c21fbb3a9ac93f5e98e48edf95..5fbdb4c20a9b078e00274677045c93cf60229639 100644 (file)
@@ -40,6 +40,7 @@
 
 #define MCP795_ST_BIT  0x80
 #define MCP795_24_BIT  0x40
+#define MCP795_LP_BIT  BIT(5)
 
 static int mcp795_rtcc_read(struct device *dev, u8 addr, u8 *buf, u8 count)
 {
@@ -109,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] & 0x10) | bin2bcd(tim->tm_mon);
+       data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon);
 
        if (tim->tm_year > 100)
                tim->tm_year -= 100;