Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / qcom-msm8660.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index e0b2ce2910e0aeef770230ac727effc79236dc39..ef2fe72b54c91e5b139a38788e5695fe991855cc 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -67,15 +67,16 @@
                        cpu-offset = <0x40000>;
                };
 
-               msmgpio: gpio@800000 {
-                       compatible = "qcom,msm-gpio";
-                       reg = <0x00800000 0x4000>;
+               tlmm: pinctrl@800000 {
+                       compatible = "qcom,msm8660-pinctrl";
+                       reg = <0x800000 0x4000>;
+
                        gpio-controller;
                        #gpio-cells = <2>;
-                       ngpio = <173>;
                        interrupts = <0 16 0x4>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
+
                };
 
                gcc: clock-controller@900000 {
@@ -115,7 +116,7 @@
 
                        pmicintc: pmic@0 {
                                compatible = "qcom,pm8058";
-                               interrupt-parent = <&msmgpio>;
+                               interrupt-parent = <&tlmm>;
                                interrupts = <88 8>;
                                #interrupt-cells = <2>;
                                interrupt-controller;