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

[linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 24d16030d60cd193c515aaad8aaa2b0af00600ad..1adf9f8156522dc2269a23f5ba1838bf4bed2df7 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -373,6 +373,17 @@ config RTC_DRV_MAX77686
          This driver can also be built as a module. If so, the module
          will be called rtc-max77686.
 
+config RTC_DRV_MESON_VRTC
+       tristate "Amlogic Meson Virtual RTC"
+       depends on ARCH_MESON || COMPILE_TEST
+       default m if ARCH_MESON
+       help
+         If you say yes here you will get support for the
+         Virtual RTC of Amlogic SoCs.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-meson-vrtc.
+
 config RTC_DRV_RK808
        tristate "Rockchip RK805/RK808/RK809/RK817/RK818 RTC"
        depends on MFD_RK808
@@ -875,9 +886,15 @@ config RTC_DRV_DS3232_HWMON
 config RTC_DRV_PCF2127
        tristate "NXP PCF2127"
        depends on RTC_I2C_AND_SPI
+       select WATCHDOG_CORE if WATCHDOG
        help
          If you say yes here you get support for the NXP PCF2127/29 RTC
-         chips.
+         chips with integrated quartz crystal for industrial applications.
+         Both chips also have watchdog timer and tamper switch detection
+         features.
+
+         PCF2127 has an additional feature of 512 bytes battery backed
+         memory that's accessible using nvmem interface.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf2127.
@@ -1268,7 +1285,7 @@ config RTC_DRV_ZYNQMP
 
 config RTC_DRV_CROS_EC
        tristate "Chrome OS EC RTC driver"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          If you say yes here you will get support for the
          Chrome OS Embedded Controller's RTC.
@@ -1317,6 +1334,21 @@ config RTC_DRV_IMXDI
           This driver can also be built as a module, if so, the module
           will be called "rtc-imxdi".
 
+config RTC_DRV_FSL_FTM_ALARM
+       tristate "Freescale FlexTimer alarm timer"
+       depends on ARCH_LAYERSCAPE || SOC_LS1021A
+       select FSL_RCPM
+       default y
+       help
+          For the FlexTimer in LS1012A, LS1021A, LS1028A, LS1043A, LS1046A,
+          LS1088A, LS208xA, we can use FTM as the wakeup source.
+
+          Say y here to enable FTM alarm support. The FTM alarm provides
+          alarm functions for wakeup system from deep sleep.
+
+          This driver can also be built as a module, if so, the module
+          will be called "rtc-fsl-ftm-alarm".
+
 config RTC_DRV_MESON
        tristate "Amlogic Meson RTC"
        depends on (ARM && ARCH_MESON) || COMPILE_TEST