Merge tag 'rtc-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[linux-2.6-microblaze.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 8ab5f0a..59e6ded 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -407,6 +407,16 @@ 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_ISL12026
+       tristate "Intersil ISL12026"
+       depends on OF || COMPILE_TEST
+       help
+         If you say yes here you get support for the
+         Intersil ISL12026 RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-isl12026.
+
 config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        help
@@ -868,7 +878,7 @@ comment "Platform RTC drivers"
 
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
-       depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 || MN10300
+       depends on X86 || ARM || PPC || MIPS || SPARC64
        default y if X86
        select RTC_MC146818_LIB
        help
@@ -1413,6 +1423,7 @@ config RTC_DRV_AT91RM9200
 config RTC_DRV_AT91SAM9
        tristate "AT91SAM9 RTT as RTC"
        depends on ARCH_AT91 || COMPILE_TEST
+       depends on HAS_IOMEM
        select MFD_SYSCON
        help
          Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which
@@ -1434,16 +1445,6 @@ config RTC_DRV_AU1XXX
          This driver can also be built as a module. If so, the module
          will be called rtc-au1xxx.
 
-config RTC_DRV_BFIN
-       tristate "Blackfin On-Chip RTC"
-       depends on BLACKFIN && !BF561
-       help
-         If you say yes here you will get support for the
-         Blackfin On-Chip Real Time Clock.
-
-         This driver can also be built as a module. If so, the module
-         will be called rtc-bfin.
-
 config RTC_DRV_RS5C313
        tristate "Ricoh RS5C313"
        depends on SH_LANDISK
@@ -1512,7 +1513,7 @@ config RTC_DRV_STARFIRE
 
 config RTC_DRV_TX4939
        tristate "TX4939 SoC"
-       depends on SOC_TX4939
+       depends on SOC_TX4939 || COMPILE_TEST
        help
          Driver for the internal RTC (Realtime Clock) module found on
          Toshiba TX4939 SoC.
@@ -1656,13 +1657,6 @@ config RTC_DRV_TEGRA
          This drive can also be built as a module. If so, the module
          will be called rtc-tegra.
 
-config RTC_DRV_TILE
-       tristate "Tilera hypervisor RTC support"
-       depends on TILE
-       help
-         Enable support for the Linux driver side of the Tilera
-         hypervisor's real-time clock interface.
-
 config RTC_DRV_PUV3
        tristate "PKUnity v3 RTC support"
        depends on ARCH_PUV3