Menu
▾
▴
[Gc-linux-cvs] linux/drivers/rtc Kconfig,1.5,1.6 Makefile,1.5,1.6
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:47
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/rtc Modified Files: Kconfig Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 1 Feb 2009 18:29:35 -0000 1.5 --- Makefile 2 Mar 2009 19:26:37 -0000 1.6 *************** *** 21,26 **** --- 21,28 ---- obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o + obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o + obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o obj-$(CONFIG_RTC_DRV_DS1286) += rtc-ds1286.o *************** *** 49,52 **** --- 51,55 ---- obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o + obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o *************** *** 56,59 **** --- 59,63 ---- obj-$(CONFIG_RTC_DRV_PARISC) += rtc-parisc.o obj-$(CONFIG_RTC_DRV_PPC) += rtc-ppc.o + obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o *************** *** 68,73 **** --- 72,79 ---- obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl4030.o + obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o + obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Kconfig 1 Feb 2009 18:29:35 -0000 1.5 --- Kconfig 2 Mar 2009 19:26:37 -0000 1.6 *************** *** 36,41 **** help The RTC device that will be used to (re)initialize the system ! clock, usually rtc0. Initialization is done when the system ! starts up, and when it resumes from a low power state. This device should record time in UTC, since the kernel won't do timezone correction. --- 36,41 ---- help The RTC device that will be used to (re)initialize the system ! clock, usually rtc0. Initialization is done when the system ! starts up, and when it resumes from a low power state. This device should record time in UTC, since the kernel won't do timezone correction. *************** *** 45,49 **** This clock should be battery-backed, so that it reads the correct ! time when the system boots from a power-off state. Otherwise, your system will need an external clock source (like an NTP server). --- 45,49 ---- This clock should be battery-backed, so that it reads the correct ! time when the system boots from a power-off state. Otherwise, your system will need an external clock source (like an NTP server). *************** *** 70,75 **** /sys/class/rtc/rtc0 through /sys/.../rtcN. ! This driver can also be built as a module. If so, the module ! will be called rtc-sysfs. config RTC_INTF_PROC --- 70,74 ---- /sys/class/rtc/rtc0 through /sys/.../rtcN. ! If unsure, say Y. config RTC_INTF_PROC *************** *** 79,87 **** help Say yes here if you want to use your first RTC through the proc ! interface, /proc/driver/rtc. Other RTCs will not be available through that API. ! This driver can also be built as a module. If so, the module ! will be called rtc-proc. config RTC_INTF_DEV --- 78,85 ---- help Say yes here if you want to use your first RTC through the proc ! interface, /proc/driver/rtc. Other RTCs will not be available through that API. ! If unsure, say Y. config RTC_INTF_DEV *************** *** 91,100 **** Say yes here if you want to use your RTCs using the /dev interfaces, which "udev" sets up as /dev/rtc0 through ! /dev/rtcN. You may want to set up a symbolic link so one ! of these can be accessed as /dev/rtc, which is a name ! expected by "hwclock" and some other programs. ! This driver can also be built as a module. If so, the module ! will be called rtc-dev. config RTC_INTF_DEV_UIE_EMUL --- 89,100 ---- Say yes here if you want to use your RTCs using the /dev interfaces, which "udev" sets up as /dev/rtc0 through ! /dev/rtcN. ! You may want to set up a symbolic link so one of these ! can be accessed as /dev/rtc, which is a name ! expected by "hwclock" and some other programs. Recent ! versions of "udev" are known to set up the symlink for you. ! ! If unsure, say Y. config RTC_INTF_DEV_UIE_EMUL *************** *** 103,109 **** help Provides an emulation for RTC_UIE if the underlying rtc chip ! driver does not expose RTC_UIE ioctls. Those requests generate once-per-second update interrupts, used for synchronization. config RTC_DRV_TEST tristate "Test driver/device" --- 103,113 ---- help Provides an emulation for RTC_UIE if the underlying rtc chip ! driver does not expose RTC_UIE ioctls. Those requests generate once-per-second update interrupts, used for synchronization. + The emulation code will read the time from the hardware + clock several times per second, please enable this option + only if you know that you really need it. + config RTC_DRV_TEST tristate "Test driver/device" *************** *** 129,140 **** help If you say yes here you get support for various compatible RTC ! chips (often with battery backup) connected with I2C. This driver should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00, ! and probably other chips. In some cases the RTC must already have been initialized (by manufacturing or a bootloader). The first seven registers on these chips hold an RTC, and other registers may add features such as NVRAM, a trickle charger for ! the RTC/NVRAM backup power, and alarms. NVRAM is visible in sysfs, but other chip features may not be available. --- 133,144 ---- help If you say yes here you get support for various compatible RTC ! chips (often with battery backup) connected with I2C. This driver should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00, ! and probably other chips. In some cases the RTC must already have been initialized (by manufacturing or a bootloader). The first seven registers on these chips hold an RTC, and other registers may add features such as NVRAM, a trickle charger for ! the RTC/NVRAM backup power, and alarms. NVRAM is visible in sysfs, but other chip features may not be available. *************** *** 147,154 **** help If you say yes here you get support for Dallas Semiconductor ! DS1374 real-time clock chips. If an interrupt is associated with the device, the alarm functionality is supported. ! This driver can also be built as a module. If so, the module will be called rtc-ds1374. --- 151,158 ---- help If you say yes here you get support for Dallas Semiconductor ! DS1374 real-time clock chips. If an interrupt is associated with the device, the alarm functionality is supported. ! This driver can also be built as a module. If so, the module will be called rtc-ds1374. *************** *** 238,241 **** --- 242,251 ---- watchdog timer in the ST M41T60 and M41T80 RTC chips series. + config RTC_DRV_DM355EVM + tristate "TI DaVinci DM355 EVM RTC" + depends on MFD_DM355EVM_MSP + help + Supports the RTC firmware in the MSP430 on the DM355 EVM. + config RTC_DRV_TWL92330 boolean "TI TWL92330/Menelaus" *************** *** 244,248 **** If you say yes here you get support for the RTC on the TWL92330 "Menelaus" power management chip, used with OMAP2 ! platforms. The support is integrated with the rest of the Menelaus driver; it's not separate module. --- 254,258 ---- If you say yes here you get support for the RTC on the TWL92330 "Menelaus" power management chip, used with OMAP2 ! platforms. The support is integrated with the rest of the Menelaus driver; it's not separate module. *************** *** 305,309 **** help Select this driver to get support for the Dallas/Maxim DS1305 ! and DS1306 real time clock chips. These support a trickle charger, alarms, and NVRAM in addition to the clock. --- 315,319 ---- help Select this driver to get support for the Dallas/Maxim DS1305 ! and DS1306 real time clock chips. These support a trickle charger, alarms, and NVRAM in addition to the clock. *************** *** 314,318 **** tristate "Dallas/Maxim DS1390/93/94" help ! If you say yes here you get support for the DS1390/93/94 chips. This driver only supports the RTC feature, and not other chip --- 324,329 ---- tristate "Dallas/Maxim DS1390/93/94" help ! If you say yes here you get support for the ! Dallas/Maxim DS1390/93/94 chips. This driver only supports the RTC feature, and not other chip *************** *** 378,382 **** Your system will need to define the platform device used by ! this driver, otherwise it won't be accessible. This means you can safely enable this driver if you don't know whether or not your board has this kind of hardware. --- 389,393 ---- Your system will need to define the platform device used by ! this driver, otherwise it won't be accessible. This means you can safely enable this driver if you don't know whether or not your board has this kind of hardware. *************** *** 498,501 **** --- 509,519 ---- will be called "rtc-wm8350". + config RTC_DRV_PCF50633 + depends on MFD_PCF50633 + tristate "NXP PCF50633 RTC" + help + If you say yes here you get support for the RTC subsystem of the + NXP PCF50633 used in embedded systems. + config RTC_DRV_GCN bool "Nintendo GameCube/Wii Real Time Clock and SRAM" *************** *** 605,609 **** help Driver for the internal RTC (Realtime Clock) module found on ! Atmel AT91RM9200's and AT91SAM9RL chips. On SAM9RL chips this is powered by the backup power supply. --- 623,627 ---- help Driver for the internal RTC (Realtime Clock) module found on ! Atmel AT91RM9200's and AT91SAM9RL chips. On SAM9RL chips this is powered by the backup power supply. *************** *** 627,632 **** depends on RTC_DRV_AT91SAM9 help ! More than one RTT module is available. You can choose which ! one will be used as an RTC. The default of zero is normally OK to use, though some systems use that for non-RTC purposes. --- 645,650 ---- depends on RTC_DRV_AT91SAM9 help ! More than one RTT module is available. You can choose which ! one will be used as an RTC. The default of zero is normally OK to use, though some systems use that for non-RTC purposes. *************** *** 640,647 **** help The RTC driver needs to use one of the General Purpose Backup ! Registers (GPBRs) as well as the RTT. You can choose which one ! will be used. The default of zero is normally OK to use, but on some systems other software needs to use that register. config RTC_DRV_BFIN tristate "Blackfin On-Chip RTC" --- 658,675 ---- help The RTC driver needs to use one of the General Purpose Backup ! Registers (GPBRs) as well as the RTT. You can choose which one ! will be used. The default of zero is normally OK to use, but on some systems other software needs to use that register. + config RTC_DRV_AU1XXX + tristate "Au1xxx Counter0 RTC support" + depends on SOC_AU1X00 + help + This is a driver for the Au1xxx on-chip Counter0 (Time-Of-Year + counter) to be used as a RTC. + + This driver can also be built as a module. If so, the module + will be called rtc-au1xxx. + config RTC_DRV_BFIN tristate "Blackfin On-Chip RTC" *************** *** 676,679 **** --- 704,718 ---- class. + config RTC_DRV_PXA + tristate "PXA27x/PXA3xx" + depends on ARCH_PXA + help + If you say Y here you will get access to the real time clock + built into your PXA27x or PXA3xx CPU. + + This RTC driver uses PXA RTC registers available since pxa27x + series (RDxR, RYxR) instead of legacy RCNR, RTAR. + + config RTC_DRV_SUN4V bool "SUN4V Hypervisor RTC" *************** *** 690,692 **** --- 729,749 ---- Starfire systems. + config RTC_DRV_TX4939 + tristate "TX4939 SoC" + depends on SOC_TX4939 + help + Driver for the internal RTC (Realtime Clock) module found on + Toshiba TX4939 SoC. + + config RTC_DRV_MV + tristate "Marvell SoC RTC" + depends on ARCH_KIRKWOOD + help + If you say yes here you will get support for the in-chip RTC + that can be found in some of Marvell's SoC devices, such as + the Kirkwood 88F6281 and 88F6192. + + This driver can also be built as a module. If so, the module + will be called rtc-mv. + endif # RTC_CLASS |
