rtc: ds1302 rtc support

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index cbde770eb121062fcfa67f8dd562f827814cacc1..0cc448c0edddbe2d656e7001b1e47d0e6b512576 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,6 +20,10 @@ menuconfig RTC_CLASS
 
 if RTC_CLASS
 
+if GEN_RTC || RTC
+comment "Conflicting RTC option has been selected, check GEN_RTC and RTC"
+endif
+
 config RTC_HCTOSYS
        bool "Set system time from RTC on startup and resume"
        depends on RTC_CLASS = y
@@ -36,7 +40,9 @@ config RTC_HCTOSYS_DEVICE
        help
          The RTC device that will be used to (re)initialize the system
          clock, usually rtc0.  Initialization is done when the system
-         starts up, and when it resumes from a low power state.
+         starts up, and when it resumes from a low power state.  This
+         device should record time in UTC, since the kernel won't do
+         timezone correction.
 
          The driver for this RTC device must be loaded before late_initcall
          functions run, so it must usually be statically linked.
@@ -47,7 +53,7 @@ config RTC_HCTOSYS_DEVICE
 
          If the clock you specify here is not battery backed, it may still
          be useful to reinitialize system time when resuming from system
-         sleep states.  Do not specify an RTC here unless it stays powered
+         sleep states. Do not specify an RTC here unless it stays powered
          during all this system's supported sleep states.
 
 config RTC_DEBUG
@@ -133,14 +139,14 @@ config RTC_DRV_DS1307
 
          The first seven registers on these chips hold an RTC, and other
          registers may add features such as NVRAM, a trickle charger for
-         the RTC/NVRAM backup power, and alarms.  This driver may not
-         expose all those available chip features.
+         the RTC/NVRAM backup power, and alarms.  NVRAM is visible in
+         sysfs, but other chip features may not be available.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1307.
 
 config RTC_DRV_DS1374
-       tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
+       tristate "Dallas/Maxim DS1374"
        depends on RTC_CLASS && I2C
        help
          If you say yes here you get support for Dallas Semiconductor
@@ -160,7 +166,7 @@ config RTC_DRV_DS1672
          will be called rtc-ds1672.
 
 config RTC_DRV_MAX6900
-       tristate "Maxim 6900"
+       tristate "Maxim MAX6900"
        help
          If you say yes here you will get support for the
          Maxim MAX6900 I2C RTC chip.
@@ -178,10 +184,10 @@ config RTC_DRV_RS5C372
          will be called rtc-rs5c372.
 
 config RTC_DRV_ISL1208
-       tristate "Intersil 1208"
+       tristate "Intersil ISL1208"
        help
          If you say yes here you get support for the
-         Intersil 1208 RTC chip.
+         Intersil ISL1208 RTC chip.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-isl1208.
@@ -218,7 +224,7 @@ config RTC_DRV_PCF8583
          will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
-       tristate "ST M41T80 series RTC"
+       tristate "ST M41T80/81/82/83/84/85/87"
        help
          If you say Y here you will get support for the
          ST M41T80 RTC chips series. Currently following chips are
@@ -250,6 +256,15 @@ comment "SPI RTC drivers"
 
 if SPI_MASTER
 
+config RTC_DRV_MAX6902
+       tristate "Maxim MAX6902"
+       help
+         If you say yes here you will get support for the
+         Maxim MAX6902 SPI RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-max6902.
+
 config RTC_DRV_RS5C348
        tristate "Ricoh RS5C348A/B"
        help
@@ -259,15 +274,6 @@ config RTC_DRV_RS5C348
          This driver can also be built as a module. If so, the module
          will be called rtc-rs5c348.
 
-config RTC_DRV_MAX6902
-       tristate "Maxim 6902"
-       help
-         If you say yes here you will get support for the
-         Maxim MAX6902 SPI RTC chip.
-
-         This driver can also be built as a module. If so, the module
-         will be called rtc-max6902.
-
 endif # SPI_MASTER
 
 comment "Platform RTC drivers"
@@ -300,33 +306,39 @@ config RTC_DRV_DS1216
        help
          If you say yes here you get support for the Dallas DS1216 RTC chips.
 
+config RTC_DRV_DS1302
+       tristate "Dallas DS1302"
+       depends on SH_SECUREEDGE5410
+       help
+         If you say yes here you get support for the Dallas DS1302 RTC chips.
+
 config RTC_DRV_DS1553
-       tristate "Dallas DS1553"
+       tristate "Maxim/Dallas DS1553"
        help
          If you say yes here you get support for the
-         Dallas DS1553 timekeeping chip.
+         Maxim/Dallas DS1553 timekeeping chip.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1553.
 
-config RTC_DRV_STK17TA8
-       tristate "Simtek STK17TA8"
-       depends on RTC_CLASS
+config RTC_DRV_DS1742
+       tristate "Maxim/Dallas DS1742/1743"
        help
          If you say yes here you get support for the
-         Simtek STK17TA8 timekeeping chip.
+         Maxim/Dallas DS1742/1743 timekeeping chip.
 
          This driver can also be built as a module. If so, the module
-         will be called rtc-stk17ta8.
+         will be called rtc-ds1742.
 
-config RTC_DRV_DS1742
-       tristate "Dallas DS1742/1743"
+config RTC_DRV_STK17TA8
+       tristate "Simtek STK17TA8"
+       depends on RTC_CLASS
        help
          If you say yes here you get support for the
-         Dallas DS1742/1743 timekeeping chip.
+         Simtek STK17TA8 timekeeping chip.
 
          This driver can also be built as a module. If so, the module
-         will be called rtc-ds1742.
+         will be called rtc-stk17ta8.
 
 config RTC_DRV_M48T86
        tristate "ST M48T86/Dallas DS12887"
@@ -402,7 +414,7 @@ config RTC_DRV_SA1100
 
 config RTC_DRV_SH
        tristate "SuperH On-Chip RTC"
-       depends on RTC_CLASS && (CPU_SH3 || CPU_SH4)
+       depends on RTC_CLASS && SUPERH
        help
          Say Y here to enable support for the on-chip RTC found in
          most SuperH processors.
@@ -445,7 +457,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_BFIN
        tristate "Blackfin On-Chip RTC"
-       depends on BFIN
+       depends on BLACKFIN
        help
          If you say yes here you will get support for the
          Blackfin On-Chip Real Time Clock.