aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/Kconfig
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2013-01-15 11:09:49 -0500
committerJohn Stultz <john.stultz@linaro.org>2013-01-15 21:16:08 -0500
commit05ad717c77b1b8e98a1dd768c3700036d634629e (patch)
treec52d75ca925bcd9b4c7125aad4c1059d7d3a43ee /drivers/rtc/Kconfig
parent9ecf37eb7a81e3295a1b274eafb6f83d7d2cabf0 (diff)
timekeeping: Add CONFIG_HAS_PERSISTENT_CLOCK option
Make the persistent clock check a kernel config option, so that some platform can explicitely select it, also make CONFIG_RTC_HCTOSYS and RTC_SYSTOHC depend on its non-existence, which could prevent the persistent clock and RTC code from doing similar thing twice during system's init/suspend/resume phases. If the CONFIG_HAS_PERSISTENT_CLOCK=n, then no change happens for kernel which still does the persistent clock check in timekeeping_init(). Cc: Thomas Gleixner <tglx@linutronix.de> Suggested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Feng Tang <feng.tang@intel.com> [jstultz: Added dependency for RTC_SYSTOHC as well] Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r--drivers/rtc/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b377e9672497..05761de7929b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,6 +20,7 @@ if RTC_CLASS
20config RTC_HCTOSYS 20config RTC_HCTOSYS
21 bool "Set system time from RTC on startup and resume" 21 bool "Set system time from RTC on startup and resume"
22 default y 22 default y
23 depends on !HAS_PERSISTENT_CLOCK
23 help 24 help
24 If you say yes here, the system time (wall clock) will be set using 25 If you say yes here, the system time (wall clock) will be set using
25 the value read from a specified RTC device. This is useful to avoid 26 the value read from a specified RTC device. This is useful to avoid
@@ -28,6 +29,7 @@ config RTC_HCTOSYS
28config RTC_SYSTOHC 29config RTC_SYSTOHC
29 bool "Set the RTC time based on NTP synchronization" 30 bool "Set the RTC time based on NTP synchronization"
30 default y 31 default y
32 depends on !HAS_PERSISTENT_CLOCK
31 help 33 help
32 If you say yes here, the system time (wall clock) will be stored 34 If you say yes here, the system time (wall clock) will be stored
33 in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11 35 in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11