From 40ded2ad07d71a224708a5e9c4647f0e9bfce276 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Wed, 5 Sep 2012 12:28:54 -0700
Subject: [PATCH] --- yaml --- r: 326794 b: refs/heads/master c:
 8407116075eca1d8d22a466759c3d38678b9dd12 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/boot/dts/msm8660-surf.dts | 19 ++++++++++++++++++-
 trunk/arch/arm/mach-msm/board-msm8x60.c  |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8896e7200e3d..2afcd07f88a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e3321631ac2eca99b3289b83ea1f290b1a8bd92
+refs/heads/master: 8407116075eca1d8d22a466759c3d38678b9dd12
diff --git a/trunk/arch/arm/boot/dts/msm8660-surf.dts b/trunk/arch/arm/boot/dts/msm8660-surf.dts
index 45bc4bb04e57..31f2157cd7d7 100644
--- a/trunk/arch/arm/boot/dts/msm8660-surf.dts
+++ b/trunk/arch/arm/boot/dts/msm8660-surf.dts
@@ -7,7 +7,7 @@
 	compatible = "qcom,msm8660-surf", "qcom,msm8660";
 	interrupt-parent = <&intc>;
 
-	intc: interrupt-controller@02080000 {
+	intc: interrupt-controller@2080000 {
 		compatible = "qcom,msm-8660-qgic";
 		interrupt-controller;
 		#interrupt-cells = <3>;
@@ -15,6 +15,23 @@
 		      < 0x02081000 0x1000 >;
 	};
 
+	timer@2000004 {
+		compatible = "qcom,msm-gpt", "qcom,msm-timer";
+		interrupts = <1 1 0x301>;
+		reg = <0x02000004 0x10>;
+		clock-frequency = <32768>;
+		cpu-offset = <0x40000>;
+	};
+
+	timer@2000024 {
+		compatible = "qcom,msm-dgt", "qcom,msm-timer";
+		interrupts = <1 0 0x301>;
+		reg = <0x02000024 0x10>,
+		      <0x02000034 0x4>;
+		clock-frequency = <6750000>;
+		cpu-offset = <0x40000>;
+	};
+
 	serial@19c400000 {
 		compatible = "qcom,msm-hsuart", "qcom,msm-uart";
 		reg = <0x19c40000 0x1000>,
diff --git a/trunk/arch/arm/mach-msm/board-msm8x60.c b/trunk/arch/arm/mach-msm/board-msm8x60.c
index 93f90410d0dd..a28a20e2f118 100644
--- a/trunk/arch/arm/mach-msm/board-msm8x60.c
+++ b/trunk/arch/arm/mach-msm/board-msm8x60.c
@@ -159,7 +159,7 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
 	.handle_irq = gic_handle_irq,
 	.init_machine = msm8x60_dt_init,
 	.init_late = msm8x60_init_late,
-	.timer = &msm8x60_timer,
+	.timer = &msm_dt_timer,
 	.dt_compat = msm8x60_fluid_match,
 MACHINE_END
 #endif /* CONFIG_OF */