Skip to content

Commit ede44c9

Browse files
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 <[email protected]>
1 parent 2da424a commit ede44c9

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

drivers/rtc/rtc-pcf8523.c

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -178,28 +178,8 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
178178
if (err < 0)
179179
return err;
180180

181-
if (regs[0] & REG_SECONDS_OS) {
182-
/*
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-
}
181+
if (regs[0] & REG_SECONDS_OS)
182+
return -EINVAL;
203183

204184
tm->tm_sec = bcd2bin(regs[0] & 0x7f);
205185
tm->tm_min = bcd2bin(regs[1] & 0x7f);
@@ -235,6 +215,7 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm)
235215
return err;
236216

237217
regs[0] = REG_SECONDS;
218+
/* This will purposely overwrite REG_SECONDS_OS */
238219
regs[1] = bin2bcd(tm->tm_sec);
239220
regs[2] = bin2bcd(tm->tm_min);
240221
regs[3] = bin2bcd(tm->tm_hour);

0 commit comments

Comments
 (0)