Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.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 9bf49b3826eaf72dcf5cac5d56ac55e3462c9cf0..cdc010e0f93edcd330be85f74bda223951d6eaae 100644 (file)
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -15,7 +15,7 @@
                      < 0x02081000 0x1000 >;
        };
 
-       timer@2000004 {
+       timer@2000000 {
                compatible = "qcom,scss-timer", "qcom,msm-timer";
                interrupts = <1 0 0x301>,
                             <1 1 0x301>,
@@ -26,7 +26,18 @@
                cpu-offset = <0x40000>;
        };
 
-       serial@19c400000 {
+       msmgpio: gpio@800000 {
+               compatible = "qcom,msm-gpio";
+               reg = <0x00800000 0x1000>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               ngpio = <173>;
+               interrupts = <0 32 0x4>;
+               interrupt-controller;
+               #interrupt-cells = <2>;
+       };
+
+       serial@19c40000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x19c40000 0x1000>,
                      <0x19c00000 0x1000>;