Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...

[~andy/linux] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index da60de01f732f36a68edeb2104f66c7f2d9eda86..5e44eaabf45753f11cbfecb87d72627d56985606 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -279,6 +279,15 @@ config RTC_DRV_X1205
          This driver can also be built as a module. If so, the module
          will be called rtc-x1205.
 
+config RTC_DRV_PCF8523
+       tristate "NXP PCF8523"
+       help
+         If you say yes here you get support for the NXP PCF8523 RTC
+         chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-pcf8523.
+
 config RTC_DRV_PCF8563
        tristate "Philips PCF8563/Epson RTC8564"
        help
@@ -353,6 +362,14 @@ config RTC_DRV_TWL4030
          This driver can also be built as a module. If so, the module
          will be called rtc-twl.
 
+config RTC_DRV_TPS6586X
+       tristate "TI TPS6586X RTC driver"
+       depends on MFD_TPS6586X
+       help
+         TI Power Managment IC TPS6586X supports RTC functionality
+         along with alarm. This driver supports the RTC driver for
+         the TPS6586X RTC module.
+
 config RTC_DRV_TPS65910
        tristate "TI TPS65910 RTC driver"
        depends on RTC_CLASS && MFD_TPS65910
@@ -610,6 +627,16 @@ config RTC_DRV_DA9052
          Say y here to support the RTC driver for Dialog Semiconductor
          DA9052-BC and DA9053-AA/Bx PMICs.
 
+config RTC_DRV_DA9055
+       tristate "Dialog Semiconductor DA9055 RTC"
+       depends on MFD_DA9055
+       help
+         If you say yes here you will get support for the
+         RTC of the Dialog DA9055 PMIC.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-da9055
+
 config RTC_DRV_EFI
        tristate "EFI RTC"
        depends on IA64
@@ -778,7 +805,7 @@ config RTC_DRV_DAVINCI
 
 config RTC_DRV_IMXDI
        tristate "Freescale IMX DryIce Real Time Clock"
-       depends on SOC_IMX25
+       depends on ARCH_MXC
        help
           Support for Freescale IMX DryIce RTC
 
@@ -787,11 +814,13 @@ config RTC_DRV_IMXDI
 
 config RTC_DRV_OMAP
        tristate "TI OMAP1"
-       depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
+       depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX || SOC_AM33XX
        help
-         Say "yes" here to support the real time clock on TI OMAP1 and
-         DA8xx/OMAP-L13x chips.  This driver can also be built as a
-         module called rtc-omap.
+         Say "yes" here to support the on chip real time clock
+         present on TI OMAP1, AM33xx and DA8xx/OMAP-L13x.
+
+         This driver can also be built as a module, if so, module
+         will be called rtc-omap.
 
 config HAVE_S3C_RTC
        bool