| Message ID | 20180321024037.26393-6-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 402c8fd514681fb187c2e34131d78acc1697db5a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | rtc: remove redundant code in rtc_reset | expand |
On Wed, Mar 21, 2018 at 03:40:37PM +1300, Chris Packham wrote: > As of commit 1a1fa2406689 ("rtc: Set valid date after reset") the > command "date reset" will set the date/time to 2000-01-01 0:00:00 after > calling rtc_reset(). This means that the rx8025 implementation of > rtc_reset() does not need to call rtc_set(). > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Applied to u-boot/master, thanks!
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c index b4a149b73808..c43966a50d76 100644 --- a/drivers/rtc/rx8025.c +++ b/drivers/rtc/rx8025.c @@ -163,11 +163,10 @@ int rtc_set (struct rtc_time *tmp) } /* - * Reset the RTC. We setting the date back to 1970-01-01. + * Reset the RTC */ void rtc_reset (void) { - struct rtc_time tmp; uchar buf[16]; uchar ctl2; @@ -178,21 +177,6 @@ void rtc_reset (void) ctl2 &= ~(RTC_CTL2_BIT_PON | RTC_CTL2_BIT_VDET); ctl2 |= RTC_CTL2_BIT_XST | RTC_CTL2_BIT_VDSL; rtc_write (RTC_CTL2_REG_ADDR, ctl2); - - tmp.tm_year = 1970; - tmp.tm_mon = 1; - tmp.tm_mday= 1; - tmp.tm_hour = 0; - tmp.tm_min = 0; - tmp.tm_sec = 0; - - rtc_set(&tmp); - - printf ( "RTC: %4d-%02d-%02d %2d:%02d:%02d UTC\n", - tmp.tm_year, tmp.tm_mon, tmp.tm_mday, - tmp.tm_hour, tmp.tm_min, tmp.tm_sec); - - return; } /*
As of commit 1a1fa2406689 ("rtc: Set valid date after reset") the command "date reset" will set the date/time to 2000-01-01 0:00:00 after calling rtc_reset(). This means that the rx8025 implementation of rtc_reset() does not need to call rtc_set(). Signed-off-by: Chris Packham <judge.packham@gmail.com> --- drivers/rtc/rx8025.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)