summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <morimoto.kuninori@renesas.com>2009-05-29 07:41:26 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-06-02 12:08:52 +0900
commit4778541470cf7d074acd998fd40c06b94711e4ad (patch)
treef917a4ad0819a92c1f1d3f7a7b80993c60a3df38
parent0bf8513ed0df64b38edce63411d4b7b368464f47 (diff)
downloadlinux-stable-4778541470cf7d074acd998fd40c06b94711e4ad.tar.gz
linux-stable-4778541470cf7d074acd998fd40c06b94711e4ad.tar.bz2
linux-stable-4778541470cf7d074acd998fd40c06b94711e4ad.zip
sh: fix CONFIG_SH_PCLK_FREQ bug for sh7724
CONFIG_SH_PCLK_FREQ=33333333 is correct for sh7724. sh7724 master clock is 33333333, but peripheral is 41666666. This bug came to light because sh-sci driver had changed clk from "module_clk" to "peripheral_clk" Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/configs/se7724_defconfig2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e9392aa8c561..dec8b7b8dc6c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -502,8 +502,7 @@ config SH_PCLK_FREQ
CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \
CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG || \
- CPU_SUBTYPE_SH7786
- default "41666666" if CPU_SUBTYPE_SH7724
+ CPU_SUBTYPE_SH7786 || CPU_SUBTYPE_SH7724
default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
default "66000000" if CPU_SUBTYPE_SH4_202
default "50000000"
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index a029d0fb1163..96d2587467e6 100644
--- a/arch/sh/configs/se7724_defconfig
+++ b/arch/sh/configs/se7724_defconfig
@@ -243,7 +243,7 @@ CONFIG_SH_7724_SOLUTION_ENGINE=y
#
CONFIG_SH_TIMER_TMU=y
# CONFIG_SH_TIMER_CMT is not set
-CONFIG_SH_PCLK_FREQ=41666666
+CONFIG_SH_PCLK_FREQ=33333333
# CONFIG_NO_HZ is not set
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y