commit 23b8f42e383d99f467662bd163b5d14045892112
author Shashank Mittal <mittals@quicinc.com> Fri Apr 16 19:27:21 2010 -0700
committer Shashank Mittal <mittals@quicinc.com> Fri May 14 14:12:49 2010 -0700
tree 6797d90a320846e111009b6e2ba9f814c07b3e78
parent 52525ff79f25b8996deaa3640add1dbf87114cba

[msm8x60]: Add support for msm8x60 in LK

-- Adds new project for msm8660_surf
-- Adds new platform for msm8x60
-- Adds support for Generic Interrupt Controller (GIC)

Change-Id: Ide4baba25dad6b799f835a29ea158035ab8f5ff0

platform/msm_shared/timer.c

diff --git a/platform/msm_shared/timer.c b/platform/msm_shared/timer.c
index b30153a..57cf854 100644
--- a/platform/msm_shared/timer.c
+++ b/platform/msm_shared/timer.c
@@ -2,6 +2,8 @@
  * Copyright (c) 2008, Google Inc.
  * All rights reserved.
  *
+ * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -39,7 +41,7 @@
 #include <platform/interrupts.h>
 #include <kernel/thread.h>
 
-#ifdef PLATFORM_MSM7X30
+#if PLATFORM_MSM7X30 || PLATFORM_MSM8X60
 
 #define MSM_GPT_BASE (MSM_TMR_BASE + 0x4)
 #define MSM_DGT_BASE (MSM_TMR_BASE + 0x24)
@@ -122,6 +124,9 @@
 	if(val & mask)
 	    writel(1, DGT_CLK_CTL);
 #endif
+#ifdef PLATFORM_MSM8X60
+	writel(1, DGT_CLK_CTL);
+#endif
 	enter_critical_section();
 
 	timer_callback = callback;
@@ -152,7 +157,7 @@
 
 static void wait_for_timer_op(void)
 {
-#if PLATFORM_QSD8K || PLATFORM_MSM7X30
+#if PLATFORM_QSD8K || PLATFORM_MSM7X30 || PLATFORM_MSM8X60
 	while(readl(SPSS_TIMER_STATUS)) ;
 #endif
 }