diff options
| author | Heinrich Schuchardt | 2018-07-08 00:07:26 +0200 |
|---|---|---|
| committer | Tom Rini | 2018-07-20 15:55:04 -0400 |
| commit | af95a3e7c03e1538f43ca843f7282f36ce0488b8 (patch) | |
| tree | 7041fa692e8216766f8e86dc70e85643cdc678dc /drivers/rtc/mc146818.c | |
| parent | b27dc8ec5c8f62f655b7964bc1bd12448ef788f8 (diff) | |
drivers: rtc: correct week day for mc146818
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@gmx.de>
Diffstat (limited to 'drivers/rtc/mc146818.c')
| -rw-r--r-- | drivers/rtc/mc146818.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 500eef2ee0c..ee29c711aaa 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -83,7 +83,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) @@ -111,7 +111,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; @@ -120,6 +119,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, |