Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 48ca7132cc05da18a16c9136f3974219bce4a3d3..4941cade319f5cef06d508d0b1f1354d951c1034 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -171,7 +171,8 @@ config RTC_DRV_DS3232
        depends on RTC_CLASS && I2C
        help
          If you say yes here you get support for Dallas Semiconductor
-         DS3232 real-time clock chips.
+         DS3232 real-time clock chips. If an interrupt is associated
+         with the device, the alarm functionality is supported.
 
          This driver can also be built as a module.  If so, the module
          will be called rtc-ds3232.
@@ -195,6 +196,16 @@ config RTC_DRV_MAX8925
          This driver can also be built as a module. If so, the module
          will be called rtc-max8925.
 
+config RTC_DRV_MAX8998
+       tristate "Maxim MAX8998"
+       depends on MFD_MAX8998
+       help
+         If you say yes here you will get support for the
+         RTC of Maxim MAX8998 PMIC.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-max8998.
+
 config RTC_DRV_RS5C372
        tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"
        help
@@ -452,6 +463,18 @@ config RTC_DRV_CMOS
          This driver can also be built as a module. If so, the module
          will be called rtc-cmos.
 
+config RTC_DRV_VRTC
+       tristate "Virtual RTC for Moorestown platforms"
+       depends on X86_MRST
+       default y if X86_MRST
+
+       help
+       Say "yes" here to get direct support for the real time clock
+       found on Moorestown platforms. The VRTC is a emulated RTC that
+       derives its clock source from a real RTC in the PMIC. The MC146818
+       style programming interface is mostly conserved, but any
+       updates are done via IPC calls to the system controller FW.
+
 config RTC_DRV_DS1216
        tristate "Dallas DS1216"
        depends on SNI_RM
@@ -765,15 +788,15 @@ config RTC_DRV_AT32AP700X
          AT32AP700x family processors.
 
 config RTC_DRV_AT91RM9200
-       tristate "AT91RM9200 or AT91SAM9RL"
-       depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL
+       tristate "AT91RM9200 or some AT91SAM9 RTC"
+       depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
        help
          Driver for the internal RTC (Realtime Clock) module found on
-         Atmel AT91RM9200's and AT91SAM9RL chips. On SAM9RL chips
+         Atmel AT91RM9200's and some  AT91SAM9 chips. On AT91SAM9 chips
          this is powered by the backup power supply.
 
 config RTC_DRV_AT91SAM9
-       tristate "AT91SAM9x/AT91CAP9"
+       tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
        depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
        help
          RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
@@ -781,8 +804,8 @@ config RTC_DRV_AT91SAM9
          supply (such as a small coin cell battery), but do not need to
          be used as RTCs.
 
-         (On AT91SAM9rl chips you probably want to use the dedicated RTC
-         module and leave the RTT available for other uses.)
+         (On AT91SAM9rl and AT91SAM9G45 chips you probably want to use the
+         dedicated RTC module and leave the RTT available for other uses.)
 
 config RTC_DRV_AT91SAM9_RTT
        int
@@ -925,11 +948,12 @@ config RTC_DRV_PCAP
          If you say Y here you will get support for the RTC found on
          the PCAP2 ASIC used on some Motorola phones.
 
-config RTC_DRV_MC13783
-       depends on MFD_MC13783
-       tristate "Freescale MC13783 RTC"
+config RTC_DRV_MC13XXX
+       depends on MFD_MC13XXX
+       tristate "Freescale MC13xxx RTC"
        help
-         This enables support for the Freescale MC13783 PMIC RTC
+         This enables support for the RTCs found on Freescale's PMICs
+         MC13783 and MC13892.
 
 config RTC_DRV_MPC5121
        tristate "Freescale MPC5121 built-in RTC"
@@ -952,4 +976,13 @@ config RTC_DRV_JZ4740
          This driver can also be buillt as a module. If so, the module
          will be called rtc-jz4740.
 
+config RTC_DRV_LPC32XX
+       depends on ARCH_LPC32XX
+       tristate "NXP LPC32XX RTC"
+       help
+         This enables support for the NXP RTC in the LPC32XX
+
+         This driver can also be buillt as a module. If so, the module
+         will be called rtc-lpc32xx.
+
 endif # RTC_CLASS