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

[karo-tx-linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 19c03ab2bdcb3f2d585c7b38948b5de3bff113c1..d0cea02b5dfc5b58ca4ee3751f1c5737b221739d 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -269,6 +269,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
@@ -600,6 +609,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
@@ -768,7 +787,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
 
@@ -777,11 +796,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