ARM: msm: Move 8660 to DT timer

Add the timer entry and point the machine descriptor to the
device tree based msm timer.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
[davidb@codeaurora.org: Remove leading zeros]
Signed-off-by: David Brown <davidb@codeaurora.org>

diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 45bc4bb04e5745969184b9baa3e78e4d4c5402f3..31f2157cd7d700beeaf904cc0f4bfa2bd0783492 100644 (file)
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/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/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 93f90410d0dd08947adde800a66cc9229577e9b0..a28a20e2f118efa7084224a54c9c3fef918b9dd8 100644 (file)
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/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 */