aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlessandro Zummo <alessandro.zummo@towertech.it>2008-02-06 04:38:40 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:13 -0500
commit09b6bdb3b6a95fe270107c2831e033f9cb233d2d (patch)
tree1df397f8af55538ca40642e9d953fb5e3a934dbb /drivers
parentd12def1bcb809b6172ee207a24e00a0a4398df1d (diff)
Cosmetic fixes to RTC subsystem's Kconfig
Add adds a warning if a potentially conflicting RTC option has been selected and makes some other cosmetic fixes to the Kconfig. Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/Kconfig56
1 files changed, 30 insertions, 26 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 45e4b9648176..842d8a5616ba 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,6 +20,10 @@ menuconfig RTC_CLASS
20 20
21if RTC_CLASS 21if RTC_CLASS
22 22
23if GEN_RTC || RTC
24comment "Conflicting RTC option has been selected, check GEN_RTC and RTC"
25endif
26
23config RTC_HCTOSYS 27config RTC_HCTOSYS
24 bool "Set system time from RTC on startup and resume" 28 bool "Set system time from RTC on startup and resume"
25 depends on RTC_CLASS = y 29 depends on RTC_CLASS = y
@@ -49,7 +53,7 @@ config RTC_HCTOSYS_DEVICE
49 53
50 If the clock you specify here is not battery backed, it may still 54 If the clock you specify here is not battery backed, it may still
51 be useful to reinitialize system time when resuming from system 55 be useful to reinitialize system time when resuming from system
52 sleep states. Do not specify an RTC here unless it stays powered 56 sleep states. Do not specify an RTC here unless it stays powered
53 during all this system's supported sleep states. 57 during all this system's supported sleep states.
54 58
55config RTC_DEBUG 59config RTC_DEBUG
@@ -142,7 +146,7 @@ config RTC_DRV_DS1307
142 will be called rtc-ds1307. 146 will be called rtc-ds1307.
143 147
144config RTC_DRV_DS1374 148config RTC_DRV_DS1374
145 tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock" 149 tristate "Dallas/Maxim DS1374"
146 depends on RTC_CLASS && I2C 150 depends on RTC_CLASS && I2C
147 help 151 help
148 If you say yes here you get support for Dallas Semiconductor 152 If you say yes here you get support for Dallas Semiconductor
@@ -162,7 +166,7 @@ config RTC_DRV_DS1672
162 will be called rtc-ds1672. 166 will be called rtc-ds1672.
163 167
164config RTC_DRV_MAX6900 168config RTC_DRV_MAX6900
165 tristate "Maxim 6900" 169 tristate "Maxim MAX6900"
166 help 170 help
167 If you say yes here you will get support for the 171 If you say yes here you will get support for the
168 Maxim MAX6900 I2C RTC chip. 172 Maxim MAX6900 I2C RTC chip.
@@ -180,10 +184,10 @@ config RTC_DRV_RS5C372
180 will be called rtc-rs5c372. 184 will be called rtc-rs5c372.
181 185
182config RTC_DRV_ISL1208 186config RTC_DRV_ISL1208
183 tristate "Intersil 1208" 187 tristate "Intersil ISL1208"
184 help 188 help
185 If you say yes here you get support for the 189 If you say yes here you get support for the
186 Intersil 1208 RTC chip. 190 Intersil ISL1208 RTC chip.
187 191
188 This driver can also be built as a module. If so, the module 192 This driver can also be built as a module. If so, the module
189 will be called rtc-isl1208. 193 will be called rtc-isl1208.
@@ -220,7 +224,7 @@ config RTC_DRV_PCF8583
220 will be called rtc-pcf8583. 224 will be called rtc-pcf8583.
221 225
222config RTC_DRV_M41T80 226config RTC_DRV_M41T80
223 tristate "ST M41T80 series RTC" 227 tristate "ST M41T80/81/82/83/84/85/87"
224 help 228 help
225 If you say Y here you will get support for the 229 If you say Y here you will get support for the
226 ST M41T80 RTC chips series. Currently following chips are 230 ST M41T80 RTC chips series. Currently following chips are
@@ -252,6 +256,15 @@ comment "SPI RTC drivers"
252 256
253if SPI_MASTER 257if SPI_MASTER
254 258
259config RTC_DRV_MAX6902
260 tristate "Maxim MAX6902"
261 help
262 If you say yes here you will get support for the
263 Maxim MAX6902 SPI RTC chip.
264
265 This driver can also be built as a module. If so, the module
266 will be called rtc-max6902.
267
255config RTC_DRV_RS5C348 268config RTC_DRV_RS5C348
256 tristate "Ricoh RS5C348A/B" 269 tristate "Ricoh RS5C348A/B"
257 help 270 help
@@ -261,15 +274,6 @@ config RTC_DRV_RS5C348
261 This driver can also be built as a module. If so, the module 274 This driver can also be built as a module. If so, the module
262 will be called rtc-rs5c348. 275 will be called rtc-rs5c348.
263 276
264config RTC_DRV_MAX6902
265 tristate "Maxim 6902"
266 help
267 If you say yes here you will get support for the
268 Maxim MAX6902 SPI RTC chip.
269
270 This driver can also be built as a module. If so, the module
271 will be called rtc-max6902.
272
273endif # SPI_MASTER 277endif # SPI_MASTER
274 278
275comment "Platform RTC drivers" 279comment "Platform RTC drivers"
@@ -303,32 +307,32 @@ config RTC_DRV_DS1216
303 If you say yes here you get support for the Dallas DS1216 RTC chips. 307 If you say yes here you get support for the Dallas DS1216 RTC chips.
304 308
305config RTC_DRV_DS1553 309config RTC_DRV_DS1553
306 tristate "Dallas DS1553" 310 tristate "Maxim/Dallas DS1553"
307 help 311 help
308 If you say yes here you get support for the 312 If you say yes here you get support for the
309 Dallas DS1553 timekeeping chip. 313 Maxim/Dallas DS1553 timekeeping chip.
310 314
311 This driver can also be built as a module. If so, the module 315 This driver can also be built as a module. If so, the module
312 will be called rtc-ds1553. 316 will be called rtc-ds1553.
313 317
314config RTC_DRV_STK17TA8 318config RTC_DRV_DS1742
315 tristate "Simtek STK17TA8" 319 tristate "Maxim/Dallas DS1742/1743"
316 depends on RTC_CLASS
317 help 320 help
318 If you say yes here you get support for the 321 If you say yes here you get support for the
319 Simtek STK17TA8 timekeeping chip. 322 Maxim/Dallas DS1742/1743 timekeeping chip.
320 323
321 This driver can also be built as a module. If so, the module 324 This driver can also be built as a module. If so, the module
322 will be called rtc-stk17ta8. 325 will be called rtc-ds1742.
323 326
324config RTC_DRV_DS1742 327config RTC_DRV_STK17TA8
325 tristate "Dallas DS1742/1743" 328 tristate "Simtek STK17TA8"
329 depends on RTC_CLASS
326 help 330 help
327 If you say yes here you get support for the 331 If you say yes here you get support for the
328 Dallas DS1742/1743 timekeeping chip. 332 Simtek STK17TA8 timekeeping chip.
329 333
330 This driver can also be built as a module. If so, the module 334 This driver can also be built as a module. If so, the module
331 will be called rtc-ds1742. 335 will be called rtc-stk17ta8.
332 336
333config RTC_DRV_M48T86 337config RTC_DRV_M48T86
334 tristate "ST M48T86/Dallas DS12887" 338 tristate "ST M48T86/Dallas DS12887"