Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73318f8b authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ftrtc010: handle dates after 2106 



Use correct types for offset and time and use
rtc_time64_to_tm/rtc_tm_to_time64 to handle dates after 2106 properly.

Acked-by: default avatarHans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent e38d161f

drivers/rtc/rtc-ftrtc010.c

+6 −6
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm) 
{

	struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);



	unsigned int  days, hour, min, sec;

	unsigned long offset, time;

	u32 days, hour, min, sec, offset;

	timeu64_t time;



	sec  = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);

	min  = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);
@@ -84,7 +84,7 @@ static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm) 


	time = offset + days * 86400 + hour * 3600 + min * 60 + sec;



	rtc_time_to_tm(time, tm);

	rtc_time64_to_tm(time, tm);



	return 0;

}
@@ -92,13 +92,13 @@ static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm) 
static int ftrtc010_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);

	unsigned int sec, min, hour, day;

	unsigned long offset, time;

	u32 sec, min, hour, day, offset;

	timeu64_t time;



	if (tm->tm_year >= 2148)	/* EPOCH Year + 179 */

		return -EINVAL;



	rtc_tm_to_time(tm, &time);

	time = rtc_tm_to_time64(tm);



	sec = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);

	min = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);