diff options
author | David Brownell <david-b@pacbell.net> | 2006-08-31 10:26:35 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-08-31 10:26:35 -0400 |
commit | 851fb304b510fc1e5dc5852cda25361219c1c4b1 (patch) | |
tree | 723496cee266d15c4004ad57ad9cd4aff2ae568b /arch/arm/configs | |
parent | 8e34703b9315688305306d26148088b0a8292563 (diff) |
[ARM] 3763/1: add both rtcs to csb337 defconfig
Patch from David Brownell
This adds RTC support to the csb337 default config. Both the AT91
and the ds1307 RTCs are enabled (rtc0 and rtc1 respectively).
The ds1307 is used to initialize the system time, since it's battery-backed.
From then on the AT91 RTC is used, since it's more capable (with both
alarm and update irqs, and system wakeup capability) even though it
needs manual initialization (symlink /dev/rtc to /dev/rtc0 for older
versions of hwclock, then "hwclock --systohc") in an rc script or
from inittab.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/csb337_defconfig | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index 3594155a8137..cf3fa5cb26e4 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
@@ -621,9 +621,8 @@ CONFIG_AT91_WATCHDOG=y | |||
621 | # USB-based Watchdog Cards | 621 | # USB-based Watchdog Cards |
622 | # | 622 | # |
623 | # CONFIG_USBPCWATCHDOG is not set | 623 | # CONFIG_USBPCWATCHDOG is not set |
624 | # CONFIG_HW_RANDOM is not set | ||
624 | # CONFIG_NVRAM is not set | 625 | # CONFIG_NVRAM is not set |
625 | CONFIG_RTC=y | ||
626 | # CONFIG_AT91_RTC is not set | ||
627 | # CONFIG_DTLK is not set | 626 | # CONFIG_DTLK is not set |
628 | # CONFIG_R3964 is not set | 627 | # CONFIG_R3964 is not set |
629 | 628 | ||
@@ -956,10 +955,42 @@ CONFIG_USB_AT91=y | |||
956 | CONFIG_MMC=y | 955 | CONFIG_MMC=y |
957 | # CONFIG_MMC_DEBUG is not set | 956 | # CONFIG_MMC_DEBUG is not set |
958 | CONFIG_MMC_BLOCK=y | 957 | CONFIG_MMC_BLOCK=y |
959 | # CONFIG_MMC_WBSD is not set | ||
960 | CONFIG_MMC_AT91RM9200=y | 958 | CONFIG_MMC_AT91RM9200=y |
961 | 959 | ||
962 | # | 960 | # |
961 | # Real Time Clock | ||
962 | # | ||
963 | CONFIG_RTC_LIB=y | ||
964 | CONFIG_RTC_CLASS=y | ||
965 | CONFIG_RTC_HCTOSYS=y | ||
966 | CONFIG_RTC_HCTOSYS_DEVICE="rtc1" | ||
967 | |||
968 | # | ||
969 | # RTC interfaces | ||
970 | # | ||
971 | # CONFIG_RTC_INTF_SYSFS is not set | ||
972 | CONFIG_RTC_INTF_PROC=y | ||
973 | CONFIG_RTC_INTF_DEV=y | ||
974 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
975 | |||
976 | # | ||
977 | # RTC drivers | ||
978 | # | ||
979 | # CONFIG_RTC_DRV_X1205 is not set | ||
980 | CONFIG_RTC_DRV_DS1307=y | ||
981 | # CONFIG_RTC_DRV_DS1553 is not set | ||
982 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
983 | # CONFIG_RTC_DRV_DS1672 is not set | ||
984 | # CONFIG_RTC_DRV_DS1742 is not set | ||
985 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
986 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
987 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
988 | # CONFIG_RTC_DRV_M48T86 is not set | ||
989 | CONFIG_RTC_DRV_AT91=y | ||
990 | # CONFIG_RTC_DRV_TEST is not set | ||
991 | # CONFIG_RTC_DRV_V3020 is not set | ||
992 | |||
993 | # | ||
963 | # File systems | 994 | # File systems |
964 | # | 995 | # |
965 | CONFIG_EXT2_FS=y | 996 | CONFIG_EXT2_FS=y |