commit 65ea573703907c59733096babcd3a5a4eb07a067
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 14 02:28:12 2011 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu Apr 14 02:28:13 2011 -0700
tree ffb737e94c5183a923f526976afc872588aa311a
parent beb17d5292dc29d676f634cd0efdfa709afa91e1
parent 84a64e82e48821b373c5f3698cc5149dd16a48e2

Merge "msm8960: Add 8960 platform specific defines in timer."

platform/msm_shared/timer.c

diff --git a/platform/msm_shared/timer.c b/platform/msm_shared/timer.c
index 2a5600f..be3ac0f 100644
--- a/platform/msm_shared/timer.c
+++ b/platform/msm_shared/timer.c
@@ -96,7 +96,7 @@
 #else
 #define DGT_HZ 6144000	/* Uses LPXO/4 (24.576 MHz / 4) */
 #endif
-#elif defined PLATFORM_MSM8X60
+#elif (defined(PLATFORM_MSM8X60) || defined(PLATFORM_MSM8960))
 #define DGT_HZ 6750000	/* Uses LPXO/4 (27.0 MHz / 4) */
 #else
 #define DGT_HZ 19200000	/* Uses TCXO (19.2 MHz) */
@@ -127,7 +127,7 @@
 	if(val >= 1)
 	    writel(1, DGT_CLK_CTL);
 #endif
-#ifdef PLATFORM_MSM8X60
+#if (defined(PLATFORM_MSM8X60) || defined(PLATFORM_MSM8960))
 	writel(3, DGT_CLK_CTL);
 #endif
 	enter_critical_section();
@@ -160,7 +160,7 @@
 
 static void wait_for_timer_op(void)
 {
-#if PLATFORM_QSD8K || PLATFORM_MSM7X30 || PLATFORM_MSM8X60
+#if PLATFORM_QSD8K || PLATFORM_MSM7X30 || PLATFORM_MSM8X60 || PLATFORM_MSM8960
 	while( readl(SPSS_TIMER_STATUS) & SPSS_TIMER_STATUS_DGT_EN );
 #endif
 }