aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/Kconfig
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-07-30 11:33:07 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 06:58:55 -0400
commit60dbd6633178a8625ed71329da0167c6d50c559c (patch)
treebcbc1004dfe356ce7cf30f183725dbbc9dad3e4f /arch/cris/Kconfig
parent26bfeea38a4a5daf52c8f01c986ca8680bf1f6a1 (diff)
CRIS: GENERIC_TIME fixes
GENERIC_TIME was not functional for CRIS, giving random backward time jumps. For CRISv32 implement a new clocksource using the free running counter and ditch the arch_gettimeoffset. The random time jumps still existed, but turned out to be the write_seqlock which was missing around our do_timer() call. So switch over to GENERIC_TIME using the clocksource for CRISv32. CRISv10 doesn't have the free running counter needed for the clocksource trick, but we can still use GENERIC_TIME with arch_gettimeoffset. Unfortunately, there were problems in using the prescaler register to timer0 for the gettimeoffset calculation, so it is now ignored, making our resolution worse by the tune of 40usec (0.4%) worst case. At the same time, clean up some formatting and use NSEC_PER_SEC instead of 1000000000. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r--arch/cris/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e25bf4440b51..4827c72b9634 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -27,7 +27,7 @@ config GENERIC_CMOS_UPDATE
27 def_bool y 27 def_bool y
28 28
29config ARCH_USES_GETTIMEOFFSET 29config ARCH_USES_GETTIMEOFFSET
30 def_bool y 30 def_bool n
31 31
32config GENERIC_IOMAP 32config GENERIC_IOMAP
33 bool 33 bool
@@ -131,16 +131,19 @@ choice
131 131
132config ETRAX100LX 132config ETRAX100LX
133 bool "ETRAX-100LX-v1" 133 bool "ETRAX-100LX-v1"
134 select ARCH_USES_GETTIMEOFFSET
134 help 135 help
135 Support version 1 of the ETRAX 100LX. 136 Support version 1 of the ETRAX 100LX.
136 137
137config ETRAX100LX_V2 138config ETRAX100LX_V2
138 bool "ETRAX-100LX-v2" 139 bool "ETRAX-100LX-v2"
140 select ARCH_USES_GETTIMEOFFSET
139 help 141 help
140 Support version 2 of the ETRAX 100LX. 142 Support version 2 of the ETRAX 100LX.
141 143
142config SVINTO_SIM 144config SVINTO_SIM
143 bool "ETRAX-100LX-for-xsim-simulator" 145 bool "ETRAX-100LX-for-xsim-simulator"
146 select ARCH_USES_GETTIMEOFFSET
144 help 147 help
145 Support the xsim ETRAX Simulator. 148 Support the xsim ETRAX Simulator.
146 149