diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 07:49:08 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 07:49:08 +0100 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /arch/sh/Kconfig | |
| parent | sh: select HAVE_HW_BREAKPOINT for all SUPERH32 CPUs. (diff) | |
| parent | sh: Fix up nommu build for out-of-line pgtable changes. (diff) | |
| download | linux-fa94ddea2b29fdda7640672c8a933dbd901f0278.tar.xz linux-fa94ddea2b29fdda7640672c8a933dbd901f0278.zip | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f971cb74dd62..812395e7c4d7 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -542,14 +542,16 @@ config SH_TIMER_MTU2 config SH_PCLK_FREQ int "Peripheral clock frequency (in Hz)" - default "27000000" if CPU_SUBTYPE_SH7343 + depends on SH_CLK_CPG_LEGACY default "31250000" if CPU_SUBTYPE_SH7619 - default "32000000" if CPU_SUBTYPE_SH7722 - default "33333333" if CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7723 || \ - CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \ - CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \ - CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG || \ - CPU_SUBTYPE_SH7786 || CPU_SUBTYPE_SH7724 + default "33333333" if CPU_SUBTYPE_SH7770 || \ + CPU_SUBTYPE_SH7760 || \ + CPU_SUBTYPE_SH7705 || \ + CPU_SUBTYPE_SH7203 || \ + CPU_SUBTYPE_SH7206 || \ + CPU_SUBTYPE_SH7263 || \ + CPU_SUBTYPE_MXG || \ + CPU_SUBTYPE_SH7786 default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R default "66000000" if CPU_SUBTYPE_SH4_202 default "50000000" |