summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-21 11:05:40 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:06:30 +0100
commitc3d6ddddb01e239c7176a561c499999636ab4f61 (patch)
tree89e58c31d7852fd195b099df6211e399759aeeb6 /arch/cris
parent5062969d77fed23b8ffc1a4124e96e991adaf52c (diff)
downloadblackbird-op-linux-c3d6ddddb01e239c7176a561c499999636ab4f61.tar.gz
blackbird-op-linux-c3d6ddddb01e239c7176a561c499999636ab4f61.zip
CRIS: Move common Kconfig variable ETRAX_RTC to arch independet Kconfig.
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig12
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig12
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig6
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"
source arch/cris/arch-v10/drivers/Kconfig
source arch/cris/arch-v32/drivers/Kconfig
+config ETRAX_RTC
+ bool "Real Time Clock support"
+ depends on ETRAX_I2C
+ help
+ Enables drivers for the Real-Time Clock battery-backed chips on
+ some products. The kernel reads the time when booting, and
+ the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
+ rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc
+ device. You can check the time with cat /proc/rtc, but
+ normal time reading should be done using libc function time and
+ friends.
+
choice
prompt "RTC chip"
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
Bit set = changeable.
You probably want 00 here.
-config ETRAX_RTC
- bool "Real Time Clock support"
- depends on ETRAX_ARCH_V10
- help
- Enables drivers for the Real-Time Clock battery-backed chips on
- some products. The kernel reads the time when booting, and
- the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
- rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc
- device, major 121. You can check the time with cat /proc/rtc, but
- normal time reading should be done using libc function time and
- friends.
-
config ETRAX_DS1302_RST_ON_GENERIC_PORT
bool "DS1302 RST on Generic Port"
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
help
The pin to use for I2C clock.
-config ETRAX_RTC
- bool "Real Time Clock support"
- depends on ETRAX_ARCH_V32 && ETRAX_I2C
- help
- Enabled RTC support.
-
config ETRAX_GPIO
bool "GPIO support"
depends on ETRAX_ARCH_V32
OpenPOWER on IntegriCloud