summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/timer.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-04-21 23:09:11 +0000
committerDavid Brown <davidb@codeaurora.org>2011-06-20 16:30:07 -0700
commitfdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a (patch)
tree2c0e30e404262dbcba218e1fa86ec036b0bb1783 /arch/arm/mach-msm/timer.c
parent650f156775c2638cc02ed7df31186a09ba79666a (diff)
downloadlinux-3.10-fdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a.tar.gz
linux-3.10-fdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a.tar.bz2
linux-3.10-fdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a.zip
msm: timer: Fix DGT rate on 8960 and 8660
The DGT runs at 27 MHz divided by 4 on 8660 and 8960. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
-rw-r--r--arch/arm/mach-msm/timer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 2232032181b..63621f152c9 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -57,10 +57,12 @@ enum timer_location {
#if defined(CONFIG_ARCH_QSD8X50)
#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */
#define MSM_DGT_SHIFT (0)
-#elif defined(CONFIG_ARCH_MSM7X30) || defined(CONFIG_ARCH_MSM8X60) || \
- defined(CONFIG_ARCH_MSM8960)
+#elif defined(CONFIG_ARCH_MSM7X30)
#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */
#define MSM_DGT_SHIFT (0)
+#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)
+#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */
+#define MSM_DGT_SHIFT (0)
#else
#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */
#define MSM_DGT_SHIFT (5)