Merge branch 'stable/for-jens-3.14' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0077302221164e62df209626e6595a5a9505e4ee..db933decc39ce39ec26d9df0da4212d61fe3635d 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -212,6 +212,17 @@ config RTC_DRV_DS3232
          This driver can also be built as a module.  If so, the module
          will be called rtc-ds3232.
 
+config RTC_DRV_HYM8563
+       tristate "Haoyu Microelectronics HYM8563"
+       depends on I2C && OF
+       help
+         Say Y to enable support for the HYM8563 I2C RTC chip. Apart
+         from the usual rtc functions it provides a clock output of
+         up to 32kHz.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-hym8563.
+
 config RTC_DRV_LP8788
        tristate "TI LP8788 RTC driver"
        depends on MFD_LP8788
@@ -304,6 +315,17 @@ config RTC_DRV_ISL12022
          This driver can also be built as a module. If so, the module
          will be called rtc-isl12022.
 
+config RTC_DRV_ISL12057
+       depends on I2C
+       select REGMAP_I2C
+       tristate "Intersil ISL12057"
+       help
+         If you say yes here you get support for the Intersil ISL12057
+         I2C RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-isl12057.
+
 config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        help
@@ -626,7 +648,7 @@ comment "Platform RTC drivers"
 
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
-       depends on X86 || ARM || M32R || ATARI || PPC || MIPS || SPARC64
+       depends on X86 || ARM || M32R || PPC || MIPS || SPARC64
        default y if X86
        help
          Say "yes" here to get direct support for the real time clock
@@ -1104,6 +1126,13 @@ config RTC_DRV_SUN4V
          If you say Y here you will get support for the Hypervisor
          based RTC on SUN4V systems.
 
+config RTC_DRV_SUNXI
+       tristate "Allwinner sun4i/sun7i RTC"
+       depends on ARCH_SUNXI
+       help
+         If you say Y here you will get support for the RTC found on
+         Allwinner A10/A20.
+
 config RTC_DRV_STARFIRE
        bool "Starfire RTC"
        depends on SPARC64