Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[kernel/kernel-generic.git] / arch / arm / boot / dts / msm8660-surf.dts

diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 67f8670..9bf49b3 100644 (file)
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -16,19 +16,13 @@
        };
 
        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>;
+               compatible = "qcom,scss-timer", "qcom,msm-timer";
+               interrupts = <1 0 0x301>,
+                            <1 1 0x301>,
+                            <1 2 0x301>;
+               reg = <0x02000000 0x100>;
+               clock-frequency = <27000000>,
+                                 <32768>;
                cpu-offset = <0x40000>;
        };