[U-Boot] [PATCH v2 1/1] drivers: rtc: correct week day for mc146818

Heinrich Schuchardt xypron.glpk at gmx.de
Sat Jul 7 22:07:26 UTC 2018


For qemu-x86 the date command produces wrong days of the week:
Date: 2018-07-06 (Saturday)    Time: 18:02:03
Date: 2018-07-07 (unknown day)    Time: 21:02:06

According to a comment in the Linux driver the mc146818 only updates the
day of the week if the register value is non-zero.

Sunday is 1, saturday is 7 unlike in U-Boot (see data sheet
https://www.nxp.com/docs/en/data-sheet/MC146818.pdf).

So let's use our library function to determine the day of the week.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
v2
	the day of the week must be calculated after filling the rtc_tm
---
 drivers/rtc/mc146818.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 444d4baf0b..744c0f4d75 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -81,7 +81,7 @@ static void mc146818_write8(int reg, uchar val)
 
 static int mc146818_get(struct rtc_time *tmp)
 {
-	uchar sec, min, hour, mday, wday, mon, year;
+	uchar sec, min, hour, mday, wday __attribute__((unused)),mon, year;
 
 	/* here check if rtc can be accessed */
 	while ((mc146818_read8(RTC_CONFIG_A) & 0x80) == 0x80)
@@ -109,7 +109,6 @@ static int mc146818_get(struct rtc_time *tmp)
 	tmp->tm_mday = bcd2bin(mday & 0x3f);
 	tmp->tm_mon  = bcd2bin(mon & 0x1f);
 	tmp->tm_year = bcd2bin(year);
-	tmp->tm_wday = bcd2bin(wday & 0x07);
 
 	if (tmp->tm_year < 70)
 		tmp->tm_year += 2000;
@@ -118,6 +117,11 @@ static int mc146818_get(struct rtc_time *tmp)
 
 	tmp->tm_yday = 0;
 	tmp->tm_isdst = 0;
+	/*
+	 * The mc146818 only updates wday if it is non-zero, sunday is 1
+	 * saturday is 7. So let's use our library routine.
+	 */
+	rtc_calc_weekday(tmp);
 #ifdef RTC_DEBUG
 	printf("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
 	       tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-- 
2.18.0



More information about the U-Boot mailing list