Merge tag 's390-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 1adf9f8156522dc2269a23f5ba1838bf4bed2df7..34c8b6c7e0954ef9a49a6f693900896cf7621101 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -240,6 +240,7 @@ config RTC_DRV_AS3722
 
 config RTC_DRV_DS1307
        tristate "Dallas/Maxim DS1307/37/38/39/40/41, ST M41T00, EPSON RX-8025, ISL12057"
 
 config RTC_DRV_DS1307
        tristate "Dallas/Maxim DS1307/37/38/39/40/41, ST M41T00, EPSON RX-8025, ISL12057"

+       select REGMAP_I2C

        help
          If you say yes here you get support for various compatible RTC
          chips (often with battery backup) connected with I2C. This driver
        help
          If you say yes here you get support for various compatible RTC
          chips (often with battery backup) connected with I2C. This driver


@@ -373,17 +374,6 @@ config RTC_DRV_MAX77686
          This driver can also be built as a module. If so, the module
          will be called rtc-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
 config RTC_DRV_RK808
        tristate "Rockchip RK805/RK808/RK809/RK817/RK818 RTC"
        depends on MFD_RK808


@@ -509,12 +499,13 @@ config RTC_DRV_M41T80_WDT
        help
          If you say Y here you will get support for the
          watchdog timer in the ST M41T60 and M41T80 RTC chips series.
        help
          If you say Y here you will get support for the
          watchdog timer in the ST M41T60 and M41T80 RTC chips series.

+

 config RTC_DRV_BD70528
        tristate "ROHM BD70528 PMIC RTC"
        depends on MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
        help
          If you say Y here you will get support for the RTC
 config RTC_DRV_BD70528
        tristate "ROHM BD70528 PMIC RTC"
        depends on MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
        help
          If you say Y here you will get support for the RTC

-         on ROHM BD70528 Power Management IC.
+         block on ROHM BD70528 and BD71828 Power Management IC.

 
          This driver can also be built as a module. If so, the module
          will be called rtc-bd70528.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-bd70528.


@@ -632,6 +623,7 @@ config RTC_DRV_RX8010
 
 config RTC_DRV_RX8581
        tristate "Epson RX-8571/RX-8581"
 
 config RTC_DRV_RX8581
        tristate "Epson RX-8571/RX-8581"

+       select REGMAP_I2C

        help
          If you say yes here you will get support for the Epson RX-8571/
          RX-8581.
        help
          If you say yes here you will get support for the Epson RX-8571/
          RX-8581.


@@ -659,6 +651,7 @@ config RTC_DRV_EM3027
 
 config RTC_DRV_RV3028
        tristate "Micro Crystal RV3028"
 
 config RTC_DRV_RV3028
        tristate "Micro Crystal RV3028"

+       select REGMAP_I2C

        help
          If you say yes here you get support for the Micro Crystal
          RV3028.
        help
          If you say yes here you get support for the Micro Crystal
          RV3028.


@@ -687,13 +680,14 @@ config RTC_DRV_S5M
          will be called rtc-s5m.
 
 config RTC_DRV_SD3078
          will be called rtc-s5m.
 
 config RTC_DRV_SD3078

-    tristate "ZXW Shenzhen whwave SD3078"
-    help
-      If you say yes here you get support for the ZXW Shenzhen whwave
-      SD3078 RTC chips.
+       tristate "ZXW Shenzhen whwave SD3078"
+       select REGMAP_I2C
+       help
+         If you say yes here you get support for the ZXW Shenzhen whwave
+         SD3078 RTC chips.

 
 

-      This driver can also be built as a module. If so, the module
-      will be called rtc-sd3078
+         This driver can also be built as a module. If so, the module
+         will be called rtc-sd3078

 
 endif # I2C
 
 
 endif # I2C
 


@@ -859,14 +853,14 @@ config RTC_I2C_AND_SPI
        default m if I2C=m
        default y if I2C=y
        default y if SPI_MASTER=y
        default m if I2C=m
        default y if I2C=y
        default y if SPI_MASTER=y

-       select REGMAP_I2C if I2C
-       select REGMAP_SPI if SPI_MASTER

 
 comment "SPI and I2C RTC drivers"
 
 config RTC_DRV_DS3232
        tristate "Dallas/Maxim DS3232/DS3234"
        depends on RTC_I2C_AND_SPI
 
 comment "SPI and I2C RTC drivers"
 
 config RTC_DRV_DS3232
        tristate "Dallas/Maxim DS3232/DS3234"
        depends on RTC_I2C_AND_SPI

+       select REGMAP_I2C if I2C
+       select REGMAP_SPI if SPI_MASTER

        help
          If you say yes here you get support for Dallas Semiconductor
          DS3232 and DS3234 real-time clock chips. If an interrupt is associated
        help
          If you say yes here you get support for Dallas Semiconductor
          DS3232 and DS3234 real-time clock chips. If an interrupt is associated


@@ -886,6 +880,8 @@ config RTC_DRV_DS3232_HWMON
 config RTC_DRV_PCF2127
        tristate "NXP PCF2127"
        depends on RTC_I2C_AND_SPI
 config RTC_DRV_PCF2127
        tristate "NXP PCF2127"
        depends on RTC_I2C_AND_SPI

+       select REGMAP_I2C if I2C
+       select REGMAP_SPI if SPI_MASTER

        select WATCHDOG_CORE if WATCHDOG
        help
          If you say yes here you get support for the NXP PCF2127/29 RTC
        select WATCHDOG_CORE if WATCHDOG
        help
          If you say yes here you get support for the NXP PCF2127/29 RTC


@@ -902,6 +898,8 @@ config RTC_DRV_PCF2127
 config RTC_DRV_RV3029C2
        tristate "Micro Crystal RV3029/3049"
        depends on RTC_I2C_AND_SPI
 config RTC_DRV_RV3029C2
        tristate "Micro Crystal RV3029/3049"
        depends on RTC_I2C_AND_SPI

+       select REGMAP_I2C if I2C
+       select REGMAP_SPI if SPI_MASTER

        help
          If you say yes here you get support for the Micro Crystal
          RV3029 and RV3049 RTC chips.
        help
          If you say yes here you get support for the Micro Crystal
          RV3029 and RV3049 RTC chips.


@@ -1337,8 +1335,6 @@ config RTC_DRV_IMXDI
 config RTC_DRV_FSL_FTM_ALARM
        tristate "Freescale FlexTimer alarm timer"
        depends on ARCH_LAYERSCAPE || SOC_LS1021A
 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.
        help
           For the FlexTimer in LS1012A, LS1021A, LS1028A, LS1043A, LS1046A,
           LS1088A, LS208xA, we can use FTM as the wakeup source.


@@ -1360,6 +1356,17 @@ config RTC_DRV_MESON
           This driver can also be built as a module, if so, the module
           will be called "rtc-meson".
 
           This driver can also be built as a module, if so, the module
           will be called "rtc-meson".
 

+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_OMAP
        tristate "TI OMAP Real Time Clock"
        depends on ARCH_OMAP || ARCH_DAVINCI || COMPILE_TEST
 config RTC_DRV_OMAP
        tristate "TI OMAP Real Time Clock"
        depends on ARCH_OMAP || ARCH_DAVINCI || COMPILE_TEST


@@ -1459,6 +1466,7 @@ config RTC_DRV_PL031
 config RTC_DRV_AT91RM9200
        tristate "AT91RM9200 or some AT91SAM9 RTC"
        depends on ARCH_AT91 || COMPILE_TEST
 config RTC_DRV_AT91RM9200
        tristate "AT91RM9200 or some AT91SAM9 RTC"
        depends on ARCH_AT91 || COMPILE_TEST

+       depends on OF

        help
          Driver for the internal RTC (Realtime Clock) module found on
          Atmel AT91RM9200's and some  AT91SAM9 chips. On AT91SAM9 chips
        help
          Driver for the internal RTC (Realtime Clock) module found on
          Atmel AT91RM9200's and some  AT91SAM9 chips. On AT91SAM9 chips


@@ -1510,9 +1518,9 @@ config RTC_DRV_PXA
        depends on ARCH_PXA
        select RTC_DRV_SA1100
        help
        depends on ARCH_PXA
        select RTC_DRV_SA1100
        help

-         If you say Y here you will get access to the real time clock
-         built into your PXA27x or PXA3xx CPU. This RTC is actually 2 RTCs
-         consisting of an SA1100 compatible RTC and the extended PXA RTC.
+        If you say Y here you will get access to the real time clock
+        built into your PXA27x or PXA3xx CPU. This RTC is actually 2 RTCs
+        consisting of an SA1100 compatible RTC and the extended PXA RTC.

 
         This RTC driver uses PXA RTC registers available since pxa27x
         series (RDxR, RYxR) instead of legacy RCNR, RTAR.
 
         This RTC driver uses PXA RTC registers available since pxa27x
         series (RDxR, RYxR) instead of legacy RCNR, RTAR.