3 files changed, 0 insertions, 81 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index cf0e3bc6d150..d4b6626ec323 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -269,38 +269,6 @@ config ETRAX_AXISFLASHMAP
          This option enables MTD mapping of flash devices.  Needed to use
          flash memories.  If unsure, say Y.
-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:arch/cris/include/asm/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
-        default ETRAX_DS1302
-config ETRAX_DS1302
-        depends on ETRAX_ARCH_V10
-        bool "DS1302"
-        help
-          Enables the driver for the DS1302 Real-Time Clock battery-backed
-          chip on some products.
-config ETRAX_PCF8563
-        bool "PCF8563"
-        help
-          Enables the driver for the PCF8563 Real-Time Clock battery-backed
-          chip on some products.
-endchoice
 config ETRAX_SYNCHRONOUS_SERIAL
        bool "Synchronous serial-port support"
        help
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index daf5f19b61a1..f7c4272fabf0 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -580,51 +580,4 @@ config ETRAX_PB_CHANGEABLE_BITS
          Bit set = changeable.
          You probably want 00 here.
-config ETRAX_DS1302_RST_ON_GENERIC_PORT
-        bool "DS1302 RST on Generic Port"
-        depends on ETRAX_DS1302
-        help
-          If your product has the RST signal line for the DS1302 RTC on the
-          Generic Port then say Y here, otherwise leave it as N in which
-          case the RST signal line is assumed to be connected to Port PB
-          (just like the SCL and SDA lines).
-config ETRAX_DS1302_RSTBIT
-        int "DS1302 RST bit number"
-        depends on ETRAX_DS1302
-        default "2"
-        help
-          This is the bit number for the RST signal line of the DS1302 RTC on
-          the selected port. If you have selected the generic port then it
-          should be bit 27, otherwise your best bet is bit 5.
-config ETRAX_DS1302_SCLBIT
-        int "DS1302 SCL bit number"
-        depends on ETRAX_DS1302
-        default "1"
-        help
-          This is the bit number for the SCL signal line of the DS1302 RTC on
-          Port PB. This is probably best left at 3.
-config ETRAX_DS1302_SDABIT
-        int "DS1302 SDA bit number"
-        depends on ETRAX_DS1302
-        default "0"
-        help
-          This is the bit number for the SDA signal line of the DS1302 RTC on
-          Port PB. This is probably best left at 2.
-config ETRAX_DS1302_TRICKLE_CHARGE
-        int "DS1302 Trickle charger value"
-        depends on ETRAX_DS1302
-        default "0"
-        help
-          This controls the initial value of the trickle charge register.
-          0 = disabled (use this if you are unsure or have a non rechargeable battery)
-          Otherwise the following values can be OR:ed together to control the
-          charge current:
-          1 = 2kohm, 2 = 4kohm, 3 = 4kohm
-          4 = 1 diode, 8 = 2 diodes
-          Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
 endif
diff --git a/arch/cris/arch-v10/drivers/Makefile b/arch/cris/arch-v10/drivers/Makefile
index 44bf2e88c26e..e5c13183b97c 100644
--- a/arch/cris/arch-v10/drivers/Makefile
+++ b/arch/cris/arch-v10/drivers/Makefile
@@ -6,7 +6,5 @@ obj-$(CONFIG_ETRAX_AXISFLASHMAP)	+= axisflashmap.o
 obj-$(CONFIG_ETRAX_I2C)                 += i2c.o
 obj-$(CONFIG_ETRAX_I2C_EEPROM)          += eeprom.o
 obj-$(CONFIG_ETRAX_GPIO)                += gpio.o
-obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
-obj-$(CONFIG_ETRAX_PCF8563)             += pcf8563.o
 obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)  += sync_serial.o

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index cf0e3bc6d150..d4b6626ec323 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig
@@ -269,38 +269,6 @@ config ETRAX_AXISFLASHMAP
269	This option enables MTD mapping of flash devices. Needed to use	269	This option enables MTD mapping of flash devices. Needed to use
270	flash memories. If unsure, say Y.	270	flash memories. If unsure, say Y.
271		271
272	config ETRAX_RTC
273	bool "Real Time Clock support"
274	depends on ETRAX_I2C
275	help
276	Enables drivers for the Real-Time Clock battery-backed chips on
277	some products. The kernel reads the time when booting, and
278	the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
279	rtc_time struct (see <file:arch/cris/include/asm/rtc.h>) on the
280	/dev/rtc device. You can check the time with cat /proc/rtc, but
281	normal time reading should be done using libc function time and
282	friends.
283
284	choice
285	prompt "RTC chip"
286	depends on ETRAX_RTC
287	default ETRAX_DS1302
288
289	config ETRAX_DS1302
290	depends on ETRAX_ARCH_V10
291	bool "DS1302"
292	help
293	Enables the driver for the DS1302 Real-Time Clock battery-backed
294	chip on some products.
295
296	config ETRAX_PCF8563
297	bool "PCF8563"
298	help
299	Enables the driver for the PCF8563 Real-Time Clock battery-backed
300	chip on some products.
301
302	endchoice
303
304	config ETRAX_SYNCHRONOUS_SERIAL	272	config ETRAX_SYNCHRONOUS_SERIAL
305	bool "Synchronous serial-port support"	273	bool "Synchronous serial-port support"
306	help	274	help


diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index daf5f19b61a1..f7c4272fabf0 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -580,51 +580,4 @@ config ETRAX_PB_CHANGEABLE_BITS
580	Bit set = changeable.	580	Bit set = changeable.
581	You probably want 00 here.	581	You probably want 00 here.
582		582
583	config ETRAX_DS1302_RST_ON_GENERIC_PORT
584	bool "DS1302 RST on Generic Port"
585	depends on ETRAX_DS1302
586	help
587	If your product has the RST signal line for the DS1302 RTC on the
588	Generic Port then say Y here, otherwise leave it as N in which
589	case the RST signal line is assumed to be connected to Port PB
590	(just like the SCL and SDA lines).
591
592	config ETRAX_DS1302_RSTBIT
593	int "DS1302 RST bit number"
594	depends on ETRAX_DS1302
595	default "2"
596	help
597	This is the bit number for the RST signal line of the DS1302 RTC on
598	the selected port. If you have selected the generic port then it
599	should be bit 27, otherwise your best bet is bit 5.
600
601	config ETRAX_DS1302_SCLBIT
602	int "DS1302 SCL bit number"
603	depends on ETRAX_DS1302
604	default "1"
605	help
606	This is the bit number for the SCL signal line of the DS1302 RTC on
607	Port PB. This is probably best left at 3.
608
609	config ETRAX_DS1302_SDABIT
610	int "DS1302 SDA bit number"
611	depends on ETRAX_DS1302
612	default "0"
613	help
614	This is the bit number for the SDA signal line of the DS1302 RTC on
615	Port PB. This is probably best left at 2.
616
617	config ETRAX_DS1302_TRICKLE_CHARGE
618	int "DS1302 Trickle charger value"
619	depends on ETRAX_DS1302
620	default "0"
621	help
622	This controls the initial value of the trickle charge register.
623	0 = disabled (use this if you are unsure or have a non rechargeable battery)
624	Otherwise the following values can be OR:ed together to control the
625	charge current:
626	1 = 2kohm, 2 = 4kohm, 3 = 4kohm
627	4 = 1 diode, 8 = 2 diodes
628	Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
629
630	endif	583	endif


diff --git a/arch/cris/arch-v10/drivers/Makefile b/arch/cris/arch-v10/drivers/Makefile index 44bf2e88c26e..e5c13183b97c 100644 --- a/arch/cris/arch-v10/drivers/Makefile +++ b/arch/cris/arch-v10/drivers/Makefile
@@ -6,7 +6,5 @@ obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
6	obj-$(CONFIG_ETRAX_I2C) += i2c.o	6	obj-$(CONFIG_ETRAX_I2C) += i2c.o
7	obj-$(CONFIG_ETRAX_I2C_EEPROM) += eeprom.o	7	obj-$(CONFIG_ETRAX_I2C_EEPROM) += eeprom.o
8	obj-$(CONFIG_ETRAX_GPIO) += gpio.o	8	obj-$(CONFIG_ETRAX_GPIO) += gpio.o
9	obj-$(CONFIG_ETRAX_DS1302) += ds1302.o
10	obj-$(CONFIG_ETRAX_PCF8563) += pcf8563.o
11	obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL) += sync_serial.o	9	obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL) += sync_serial.o
12		10