diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/arm/mach-shmobile/Kconfig | |
parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index aeceb9b92aeb..4c704b4e8b34 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -7,7 +7,6 @@ config ARCH_SH7367 | |||
7 | select CPU_V6 | 7 | select CPU_V6 |
8 | select HAVE_CLK | 8 | select HAVE_CLK |
9 | select COMMON_CLKDEV | 9 | select COMMON_CLKDEV |
10 | select GENERIC_TIME | ||
11 | select GENERIC_CLOCKEVENTS | 10 | select GENERIC_CLOCKEVENTS |
12 | 11 | ||
13 | config ARCH_SH7377 | 12 | config ARCH_SH7377 |
@@ -15,7 +14,6 @@ config ARCH_SH7377 | |||
15 | select CPU_V7 | 14 | select CPU_V7 |
16 | select HAVE_CLK | 15 | select HAVE_CLK |
17 | select COMMON_CLKDEV | 16 | select COMMON_CLKDEV |
18 | select GENERIC_TIME | ||
19 | select GENERIC_CLOCKEVENTS | 17 | select GENERIC_CLOCKEVENTS |
20 | 18 | ||
21 | config ARCH_SH7372 | 19 | config ARCH_SH7372 |
@@ -23,7 +21,6 @@ config ARCH_SH7372 | |||
23 | select CPU_V7 | 21 | select CPU_V7 |
24 | select HAVE_CLK | 22 | select HAVE_CLK |
25 | select COMMON_CLKDEV | 23 | select COMMON_CLKDEV |
26 | select GENERIC_TIME | ||
27 | select GENERIC_CLOCKEVENTS | 24 | select GENERIC_CLOCKEVENTS |
28 | 25 | ||
29 | comment "SH-Mobile Board Type" | 26 | comment "SH-Mobile Board Type" |
@@ -73,6 +70,18 @@ endmenu | |||
73 | 70 | ||
74 | menu "Timer and clock configuration" | 71 | menu "Timer and clock configuration" |
75 | 72 | ||
73 | config SHMOBILE_TIMER_HZ | ||
74 | int "Kernel HZ (jiffies per second)" | ||
75 | range 32 1024 | ||
76 | default "128" | ||
77 | help | ||
78 | Allows the configuration of the timer frequency. It is customary | ||
79 | to have the timer interrupt run at 1000 Hz or 100 Hz, but in the | ||
80 | case of low timer frequencies other values may be more suitable. | ||
81 | SH-Mobile systems using a 32768 Hz RCLK for clock events may want | ||
82 | to select a HZ value such as 128 that can evenly divide RCLK. | ||
83 | A HZ value that does not divide evenly may cause timer drift. | ||
84 | |||
76 | config SH_TIMER_CMT | 85 | config SH_TIMER_CMT |
77 | bool "CMT timer driver" | 86 | bool "CMT timer driver" |
78 | default y | 87 | default y |