Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6dd12dd..f15cddf 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -192,6 +192,14 @@ config RTC_DRV_DS1374
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1374.
 
+config RTC_DRV_DS1374_WDT
+       bool "Dallas/Maxim DS1374 watchdog timer"
+       depends on RTC_DRV_DS1374
+       help
+         If you say Y here you will get support for the
+         watchdog timer in the Dallas Semiconductor DS1374
+         real-time clock chips.
+
 config RTC_DRV_DS1672
        tristate "Dallas/Maxim DS1672"
        help
@@ -979,6 +987,17 @@ config RTC_DRV_NUC900
          If you say yes here you get support for the RTC subsystem of the
          NUC910/NUC920 used in embedded systems.
 
+config RTC_DRV_OPAL
+       tristate "IBM OPAL RTC driver"
+       depends on PPC_POWERNV
+       default y
+       help
+         If you say yes here you get support for the PowerNV platform RTC
+         driver based on OPAL interfaces.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-opal.
+
 comment "on-CPU RTC drivers"
 
 config RTC_DRV_DAVINCI
@@ -1109,36 +1128,42 @@ config RTC_DRV_AT91RM9200
          this is powered by the backup power supply.
 
 config RTC_DRV_AT91SAM9
-       tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-       depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
+       tristate "AT91SAM9 RTT as RTC"
+       depends on ARCH_AT91
+       select MFD_SYSCON
        help
-         RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
-         (Real Time Timer). These timers are powered by the backup power
-         supply (such as a small coin cell battery), but do not need to
-         be used as RTCs.
-
-         (On AT91SAM9rl and AT91SAM9G45 chips you probably want to use the
-         dedicated RTC module and leave the RTT available for other uses.)
+         Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which
+         can be used as an RTC thanks to the backup power supply (e.g. a
+         small coin cell battery) which keeps this block and the GPBR
+         (General Purpose Backup Registers) block powered when the device
+         is shutdown.
+         Some AT91SAM9 SoCs provide a real RTC block, on those ones you'd
+         probably want to use the real RTC block instead of the "RTT as an
+         RTC" driver.
 
 config RTC_DRV_AT91SAM9_RTT
        int
        range 0 1
        default 0
-       prompt "RTT module Number" if ARCH_AT91SAM9263
        depends on RTC_DRV_AT91SAM9
        help
+         This option is only relevant for legacy board support and
+         won't be used when booting a DT board.
+
          More than one RTT module is available. You can choose which
          one will be used as an RTC. The default of zero is normally
          OK to use, though some systems use that for non-RTC purposes.
 
 config RTC_DRV_AT91SAM9_GPBR
        int
-       range 0 3 if !ARCH_AT91SAM9263
-       range 0 15 if ARCH_AT91SAM9263
+       range 0 3
        default 0
        prompt "Backup Register Number"
        depends on RTC_DRV_AT91SAM9
        help
+         This option is only relevant for legacy board support and
+         won't be used when booting a DT board.
+
          The RTC driver needs to use one of the General Purpose Backup
          Registers (GPBRs) as well as the RTT. You can choose which one
          will be used. The default of zero is normally OK to use, but