d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcf85063: Set RTC device to work in 24h mode

Browse Source 
Sometimes the device did not set default hour mode setting correctly,
which lead to conversion errors. Explicitly set device to work in 24h
mode by clearing flag in register, instead of allowing defaults.

Reviewed by:		imp
Obtained from:		Semihalf
Sponsored by:		Alstom Group
Differential revision:	https://reviews.freebsd.org/D33497
This commit is contained in:
Hubert Mazur 2021-12-16 09:16:22 +01:00 committed by Wojciech Macek
parent be0236ebd8
commit 3e5fe3d5bf
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/iicbus/rtc/pcf85063.c
View File

@ -183,7 +183,7 @@ pcf85063_set_time(device_t dev, struct timespec *ts)
sizeof(uint8_t), IIC_WAIT);
ts->tv_sec -= utc_offset();
clock_ts_to_bcd(ts, &bcd, ctrl_reg & PCF85063_CTRL1_TIME_FORMAT);
clock_ts_to_bcd(ts, &bcd, false);
clock_dbgprint_bcd(dev, CLOCK_DBG_WRITE, &bcd);
data.sec = bcd.sec;
@ -194,11 +194,6 @@ pcf85063_set_time(device_t dev, struct timespec *ts)
data.mon = bcd.mon;
data.year = bcd.year;
/* Set this bit in case of 12-hour mode and pm hour. */
if (!(ctrl_reg & PCF85063_CTRL1_TIME_FORMAT))
if (bcd.ispm)
data.hour |= 0x20;
if (ts->tv_nsec > PCF85063_HALF_OF_SEC_NS)
data.sec++;
@ -209,6 +204,8 @@ pcf85063_set_time(device_t dev, struct timespec *ts)
return (error);
ctrl_reg |= PCF85063_CTRL1_RTC_CLK_STOP;
/* Explicitly set 24-hour mode. */
ctrl_reg &= ~PCF85063_CTRL1_TIME_FORMAT;
error = iicdev_writeto(dev, PCF85063_CTRL1_REG, &ctrl_reg,
sizeof(uint8_t), IIC_WAIT);