aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-mcp795.c
diff options
context:
space:
mode:
authorEmil Bartczak <emilbart@gmail.com>2016-12-25 17:07:42 -0500
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-01-11 11:23:04 -0500
commit72877b51d0c5abf21646723f8347c5acf8fb8a45 (patch)
tree9ca61c6f5a66b6fc97c29d79846daed64cbccfa1 /drivers/rtc/rtc-mcp795.c
parent844a3073c9896dd252810e388c2fd881efb22d66 (diff)
rtc: mcp795: Add support for weekday.
This patch adds support for saving/loading weekday value from the chip. Signed-off-by: Emil Bartczak <emilbart@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-mcp795.c')
-rw-r--r--drivers/rtc/rtc-mcp795.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index ce75e421ba00..8107fc0a2be5 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -170,6 +170,7 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
170 data[0] = (data[0] & 0x80) | bin2bcd(tim->tm_sec); 170 data[0] = (data[0] & 0x80) | bin2bcd(tim->tm_sec);
171 data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min); 171 data[1] = (data[1] & 0x80) | bin2bcd(tim->tm_min);
172 data[2] = bin2bcd(tim->tm_hour); 172 data[2] = bin2bcd(tim->tm_hour);
173 data[3] = (data[3] & 0xF8) | bin2bcd(tim->tm_wday + 1);
173 data[4] = bin2bcd(tim->tm_mday); 174 data[4] = bin2bcd(tim->tm_mday);
174 data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon + 1); 175 data[5] = (data[5] & MCP795_LP_BIT) | bin2bcd(tim->tm_mon + 1);
175 176
@@ -198,9 +199,9 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim)
198 if (ret) 199 if (ret)
199 return ret; 200 return ret;
200 201
201 dev_dbg(dev, "Set mcp795: %04d-%02d-%02d %02d:%02d:%02d\n", 202 dev_dbg(dev, "Set mcp795: %04d-%02d-%02d(%d) %02d:%02d:%02d\n",
202 tim->tm_year + 1900, tim->tm_mon, tim->tm_mday, 203 tim->tm_year + 1900, tim->tm_mon, tim->tm_mday,
203 tim->tm_hour, tim->tm_min, tim->tm_sec); 204 tim->tm_wday, tim->tm_hour, tim->tm_min, tim->tm_sec);
204 205
205 return 0; 206 return 0;
206} 207}
@@ -218,13 +219,14 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim)
218 tim->tm_sec = bcd2bin(data[0] & 0x7F); 219 tim->tm_sec = bcd2bin(data[0] & 0x7F);
219 tim->tm_min = bcd2bin(data[1] & 0x7F); 220 tim->tm_min = bcd2bin(data[1] & 0x7F);
220 tim->tm_hour = bcd2bin(data[2] & 0x3F); 221 tim->tm_hour = bcd2bin(data[2] & 0x3F);
222 tim->tm_wday = bcd2bin(data[3] & 0x07) - 1;
221 tim->tm_mday = bcd2bin(data[4] & 0x3F); 223 tim->tm_mday = bcd2bin(data[4] & 0x3F);
222 tim->tm_mon = bcd2bin(data[5] & 0x1F) - 1; 224 tim->tm_mon = bcd2bin(data[5] & 0x1F) - 1;
223 tim->tm_year = bcd2bin(data[6]) + 100; /* Assume we are in 20xx */ 225 tim->tm_year = bcd2bin(data[6]) + 100; /* Assume we are in 20xx */
224 226
225 dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d %02d:%02d:%02d\n", 227 dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d(%d) %02d:%02d:%02d\n",
226 tim->tm_year + 1900, tim->tm_mon, tim->tm_mday, 228 tim->tm_year + 1900, tim->tm_mon, tim->tm_mday,
227 tim->tm_hour, tim->tm_min, tim->tm_sec); 229 tim->tm_wday, tim->tm_hour, tim->tm_min, tim->tm_sec);
228 230
229 return rtc_valid_tm(tim); 231 return rtc_valid_tm(tim);
230} 232}