Merge tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu into next...

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 15f166a470a7f3fe5eb0e45dd2be80c2a384a76d..b1328a45b095656078f8aeb642aa3ba0f6a5f697 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -304,6 +304,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 +637,7 @@ comment "Platform RTC drivers"
 
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
-       depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS || SPARC64
+       depends on X86 || ARM || M32R || ATARI || PPC || MIPS || SPARC64
        default y if X86
        help
          Say "yes" here to get direct support for the real time clock
@@ -643,6 +654,14 @@ 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_ALPHA
+       bool "Alpha PC-style CMOS"
+       depends on ALPHA
+       default y
+       help
+         Direct support for the real-time clock found on every Alpha
+         system, specifically MC146818 compatibles.  If in doubt, say Y.
+
 config RTC_DRV_VRTC
        tristate "Virtual RTC for Intel MID platforms"
        depends on X86_INTEL_MID
@@ -1096,6 +1115,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