diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/Kconfig | 12 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 12 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 6 |
3 files changed, 12 insertions, 18 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index dfddd33c9213..4a27ef374203 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -259,6 +259,18 @@ menu "Drivers for built-in interfaces" | |||
259 | source arch/cris/arch-v10/drivers/Kconfig | 259 | source arch/cris/arch-v10/drivers/Kconfig |
260 | source arch/cris/arch-v32/drivers/Kconfig | 260 | source arch/cris/arch-v32/drivers/Kconfig |
261 | 261 | ||
262 | config ETRAX_RTC | ||
263 | bool "Real Time Clock support" | ||
264 | depends on ETRAX_I2C | ||
265 | help | ||
266 | Enables drivers for the Real-Time Clock battery-backed chips on | ||
267 | some products. The kernel reads the time when booting, and | ||
268 | the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a | ||
269 | rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc | ||
270 | device. You can check the time with cat /proc/rtc, but | ||
271 | normal time reading should be done using libc function time and | ||
272 | friends. | ||
273 | |||
262 | choice | 274 | choice |
263 | prompt "RTC chip" | 275 | prompt "RTC chip" |
264 | depends on ETRAX_RTC | 276 | depends on ETRAX_RTC |
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 10e9b507c1b3..42a6d2ed6523 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
@@ -596,18 +596,6 @@ config ETRAX_PB_CHANGEABLE_BITS | |||
596 | Bit set = changeable. | 596 | Bit set = changeable. |
597 | You probably want 00 here. | 597 | You probably want 00 here. |
598 | 598 | ||
599 | config ETRAX_RTC | ||
600 | bool "Real Time Clock support" | ||
601 | depends on ETRAX_ARCH_V10 | ||
602 | help | ||
603 | Enables drivers for the Real-Time Clock battery-backed chips on | ||
604 | some products. The kernel reads the time when booting, and | ||
605 | the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a | ||
606 | rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc | ||
607 | device, major 121. You can check the time with cat /proc/rtc, but | ||
608 | normal time reading should be done using libc function time and | ||
609 | friends. | ||
610 | |||
611 | config ETRAX_DS1302_RST_ON_GENERIC_PORT | 599 | config ETRAX_DS1302_RST_ON_GENERIC_PORT |
612 | bool "DS1302 RST on Generic Port" | 600 | bool "DS1302 RST on Generic Port" |
613 | depends on ETRAX_DS1302 | 601 | depends on ETRAX_DS1302 |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 471c203f861c..849c89bd0322 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -497,12 +497,6 @@ config ETRAX_V32_I2C_CLK_PORT | |||
497 | help | 497 | help |
498 | The pin to use for I2C clock. | 498 | The pin to use for I2C clock. |
499 | 499 | ||
500 | config ETRAX_RTC | ||
501 | bool "Real Time Clock support" | ||
502 | depends on ETRAX_ARCH_V32 && ETRAX_I2C | ||
503 | help | ||
504 | Enabled RTC support. | ||
505 | |||
506 | config ETRAX_GPIO | 500 | config ETRAX_GPIO |
507 | bool "GPIO support" | 501 | bool "GPIO support" |
508 | depends on ETRAX_ARCH_V32 | 502 | depends on ETRAX_ARCH_V32 |