aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-03-03 03:55:47 -0500
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-03-14 12:08:30 -0400
commitede44c908d44b166a5b6bd7caacd105c2ff5a70f (patch)
treec3917e54ee7928b6bda3d84578f1a9cfb3c68a86 /drivers/rtc
parent2da424af4531c4469408136772d6d5e0f8df748b (diff)
rtc: pcf8523: properly handle oscillator stop bit
The time and date register of the pcf8223 are undefined after a power reset. Properly handle the OS bit and return -EINVAL when that bit is set. It is properly removed when setting the time. This solves an issue where the time and date may be valid for rtc_valid_tm() but is not the current time. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-pcf8523.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
index 988566caaaa6..28c48b3c1946 100644
--- a/drivers/rtc/rtc-pcf8523.c
+++ b/drivers/rtc/rtc-pcf8523.c
@@ -178,28 +178,8 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
178 if (err < 0) 178 if (err < 0)
179 return err; 179 return err;
180 180
181 if (regs[0] & REG_SECONDS_OS) { 181 if (regs[0] & REG_SECONDS_OS)
182 /* 182 return -EINVAL;
183 * If the oscillator was stopped, try to clear the flag. Upon
184 * power-up the flag is always set, but if we cannot clear it
185 * the oscillator isn't running properly for some reason. The
186 * sensible thing therefore is to return an error, signalling
187 * that the clock cannot be assumed to be correct.
188 */
189
190 regs[0] &= ~REG_SECONDS_OS;
191
192 err = pcf8523_write(client, REG_SECONDS, regs[0]);
193 if (err < 0)
194 return err;
195
196 err = pcf8523_read(client, REG_SECONDS, &regs[0]);
197 if (err < 0)
198 return err;
199
200 if (regs[0] & REG_SECONDS_OS)
201 return -EAGAIN;
202 }
203 183
204 tm->tm_sec = bcd2bin(regs[0] & 0x7f); 184 tm->tm_sec = bcd2bin(regs[0] & 0x7f);
205 tm->tm_min = bcd2bin(regs[1] & 0x7f); 185 tm->tm_min = bcd2bin(regs[1] & 0x7f);
@@ -235,6 +215,7 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm)
235 return err; 215 return err;
236 216
237 regs[0] = REG_SECONDS; 217 regs[0] = REG_SECONDS;
218 /* This will purposely overwrite REG_SECONDS_OS */
238 regs[1] = bin2bcd(tm->tm_sec); 219 regs[1] = bin2bcd(tm->tm_sec);
239 regs[2] = bin2bcd(tm->tm_min); 220 regs[2] = bin2bcd(tm->tm_min);
240 regs[3] = bin2bcd(tm->tm_hour); 221 regs[3] = bin2bcd(tm->tm_hour);