From 6baa991ac9aede23738bb4286702d5a8eca18ba6 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 21 Jan 2008 11:05:40 +0100 Subject: [PATCH] --- yaml --- r: 84971 b: refs/heads/master c: c3d6ddddb01e239c7176a561c499999636ab4f61 h: refs/heads/master i: 84969: aca2b83b2b8a7468631a9dc2473d56a978bc6f7b 84967: f81334b66230a307884bb0d2f81dda09f6926b00 v: v3 --- [refs] | 2 +- trunk/arch/cris/Kconfig | 12 ++++++++++++ trunk/arch/cris/arch-v10/drivers/Kconfig | 12 ------------ trunk/arch/cris/arch-v32/drivers/Kconfig | 6 ------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 92b8bb6dd326..c9c6693c8e32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5062969d77fed23b8ffc1a4124e96e991adaf52c +refs/heads/master: c3d6ddddb01e239c7176a561c499999636ab4f61 diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig index dfddd33c9213..4a27ef374203 100644 --- a/trunk/arch/cris/Kconfig +++ b/trunk/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 ) 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/trunk/arch/cris/arch-v10/drivers/Kconfig b/trunk/arch/cris/arch-v10/drivers/Kconfig index 10e9b507c1b3..42a6d2ed6523 100644 --- a/trunk/arch/cris/arch-v10/drivers/Kconfig +++ b/trunk/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 ) 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/trunk/arch/cris/arch-v32/drivers/Kconfig b/trunk/arch/cris/arch-v32/drivers/Kconfig index 471c203f861c..849c89bd0322 100644 --- a/trunk/arch/cris/arch-v32/drivers/Kconfig +++ b/trunk/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