]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
rtc: max77663: Set Alarm wday to its reset value
authorDaniel Fu <danifu@nvidia.com>
Thu, 23 Aug 2012 11:40:08 +0000 (19:40 +0800)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 19:34:13 +0000 (12:34 -0700)
The wday is configured only when disabled alarm.
When enable alarm, set it to its default reset value 0x01,
and not enable it, to prevent an error happened when re-read the
alarm value into the virtualized generic layer at boot up in
reading alarm setting of RTC.

Bug 1034871

Change-Id: I8bfa997653edaaa286cf768c1827b5ab986f52cc
Signed-off-by: Daniel Fu <danifu@nvidia.com>
Reviewed-on: http://git-master/r/129398
(cherry picked from commit 1a61c310b66245a73e021d786eea45c31cd9f6e9)

Signed-off-by: Kerwin Wan <kerwinw@nvidia.com>
Change-Id: Ifa78078c6387689d12fe1aade8a9c531fef4f771
Reviewed-on: http://git-master/r/131130
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Rebase-Id: R495bc7741a8c90891f27e158af9ebdbcd820db97

drivers/rtc/rtc-max77663.c

index 0f654d84dba02f989a2b221ce4680540992db37f..0e14ccb7b7e91a2389f53365c37f5cc0b890160f 100644 (file)
@@ -227,9 +227,10 @@ static inline int max77663_rtc_tm_to_reg(struct max77663_rtc *rtc, u8 *buf,
        /* The wday is configured only when disabled alarm. */
        if (!alarm)
                buf[RTC_WEEKDAY] = (1 << tm->tm_wday);
-       else
-               buf[RTC_WEEKDAY] = 0;
-
+       else {
+       /* Configure its default reset value 0x01, and not enable it. */
+               buf[RTC_WEEKDAY] = 0x01;
+       }
        return 0;
 }