From c3fdf73467d0cb406436c3fe2c05ddae6ee5bc40 Mon Sep 17 00:00:00 2001 From: Shubhi Garg Date: Wed, 15 Jan 2025 06:30:03 +0000 Subject: [PATCH] Revert "Revert "rtc: fix year calculation in max77851 pmic rtc"" This reverts commit 40b9876e2f277472677c22b947da7260cf39626e. Reason for revert: Initial change to fix year calculation is correct. We do not need to blindly add +100 in year value. RTC_YEAR register can accomodate values from 0..199. Being year base 1900 and valid rtc time being 1970, valid year values are 1970..2099. Bug 4911320 Change-Id: Ic4183f4d85e4612b6a5a7ab53baf0483b7b6acad Signed-off-by: Shubhi Garg Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3283957 Reviewed-by: Evan Wei GVS: buildbot_gerritrpt Reviewed-by: Bibek Basu --- drivers/rtc/rtc-max77851.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-max77851.c b/drivers/rtc/rtc-max77851.c index eacf8ce8..47c1cf56 100644 --- a/drivers/rtc/rtc-max77851.c +++ b/drivers/rtc/rtc-max77851.c @@ -242,9 +242,12 @@ static void max77851_rtc_data_to_tm(u8 *data, struct rtc_time *tm, tm->tm_wday = ffs(data[RTC_WEEKDAY] & mask) - 1; tm->tm_mday = data[RTC_DATE] & 0x1f; tm->tm_mon = (data[RTC_MONTH] & 0x0f) - 1; - tm->tm_year = (data[RTC_YEAR] & mask) + 100; + tm->tm_year = (data[RTC_YEAR] & mask); tm->tm_yday = 0; tm->tm_isdst = 0; + + if (!info->drv_data->alarm_enable_reg) + tm->tm_year += 100; } static int max77851_rtc_tm_to_data(struct rtc_time *tm, u8 *data,