Commit 55727188 authored by Wolfram Sang's avatar Wolfram Sang Committed by Alexandre Belloni
Browse files

rtc: rzn1: fix BCD to rtc_time conversion errors 



tm_mon describes months from 0 to 11, but the register contains BCD from
1 to 12. tm_year contains years since 1900, but the BCD contains 20XX.
Apply the offsets when converting these numbers.

Fixes: deeb4b53 ("rtc: rzn1: Add new RTC driver")
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20241113113032.27409-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 6cc79a62

drivers/rtc/rtc-rzn1.c

+4 −4
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ static int rzn1_rtc_read_time(struct device *dev, struct rtc_time *tm) 
	tm->tm_hour = bcd2bin(tm->tm_hour);

	tm->tm_wday = bcd2bin(tm->tm_wday);

	tm->tm_mday = bcd2bin(tm->tm_mday);

	tm->tm_mon = bcd2bin(tm->tm_mon);

	tm->tm_year = bcd2bin(tm->tm_year);

	tm->tm_mon = bcd2bin(tm->tm_mon) - 1;

	tm->tm_year = bcd2bin(tm->tm_year) + 100;



	return 0;

}
@@ -128,8 +128,8 @@ static int rzn1_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	tm->tm_hour = bin2bcd(tm->tm_hour);

	tm->tm_wday = bin2bcd(rzn1_rtc_tm_to_wday(tm));

	tm->tm_mday = bin2bcd(tm->tm_mday);

	tm->tm_mon = bin2bcd(tm->tm_mon);

	tm->tm_year = bin2bcd(tm->tm_year);

	tm->tm_mon = bin2bcd(tm->tm_mon + 1);

	tm->tm_year = bin2bcd(tm->tm_year - 100);



	val = readl(rtc->base + RZN1_RTC_CTL2);

	if (!(val & RZN1_RTC_CTL2_STOPPED)) {