Skip to contentSkip to conversation

rtc: rv8803: fix off-by-one in month counting

PATCH In review Oliver Graute 4 participants 4 messages Apr 26, 2022 – May 5, 2022 Real time clock (RTC)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtc: rv8803: fix off-by-one in month counting

tm_mon has a range from 0..11, but the RTC expects 1..12. So we adapt the month accordingly. This was determined when comparing the driver with the corresponding linux kernel driver.

---
 drivers/rtc/rv8803.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rv8803.c +2 -2
index 66b37443de..3e3c50a872 100644
@@ -49,7 +49,7 @@ static int rv8803_rtc_set(struct udevice *dev, const struct rtc_time *tm)
 		printf("WARNING: year should be between 2000 and 2099!\n");
 
 	buf[RTC_YR_REG_ADDR] = bin2bcd(tm->tm_year % 100);
-	buf[RTC_MON_REG_ADDR] = bin2bcd(tm->tm_mon);
+	buf[RTC_MON_REG_ADDR] = bin2bcd(tm->tm_mon + 1);
 	buf[RTC_DAY_REG_ADDR] = 1 << (tm->tm_wday & 0x7);
 	buf[RTC_DATE_REG_ADDR] = bin2bcd(tm->tm_mday);
 	buf[RTC_HR_REG_ADDR] = bin2bcd(tm->tm_hour);
@@ -90,7 +90,7 @@ static int rv8803_rtc_get(struct udevice *dev, struct rtc_time *tm)
 	tm->tm_min  = bcd2bin(buf[RTC_MIN_REG_ADDR] & 0x7F);
 	tm->tm_hour = bcd2bin(buf[RTC_HR_REG_ADDR] & 0x3F);
 	tm->tm_mday = bcd2bin(buf[RTC_DATE_REG_ADDR] & 0x3F);
-	tm->tm_mon  = bcd2bin(buf[RTC_MON_REG_ADDR] & 0x1F);
+	tm->tm_mon  = bcd2bin(buf[RTC_MON_REG_ADDR] & 0x1F) - 1;
 	tm->tm_year = bcd2bin(buf[RTC_YR_REG_ADDR]) + 2000;
 	tm->tm_wday = fls(buf[RTC_DAY_REG_ADDR] & 0x7F) - 1;
 	tm->tm_yday = 0;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Oliver Graute

Hello Oliver,

Quoted 8 lines · Oliver Graute

tm_mon has a range from 0..11, but the RTC expects 1..12. So we adapt the month accordingly. This was determined when comparing the driver with the corresponding linux kernel driver.

---
 drivers/rtc/rv8803.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

This seems like a bug to me, good catch!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]