These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / qcom-msm8660.dtsi

diff --git a/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi b/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
index 20bbd19..e5f7f33 100644 (file)
--- a/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -37,6 +37,11 @@
                };
        };
 
+       cpu-pmu {
+               compatible = "qcom,scorpion-mp-pmu";
+               interrupts = <1 9 0x304>;
+       };
+
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -62,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 {
@@ -92,7 +98,7 @@
 
                        syscon-tcsr = <&tcsr>;
 
-                       serial@19c40000 {
+                       gsbi12_serial: serial@19c40000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x19c40000 0x1000>,
                                      <0x19c00000 0x1000>;
@@ -110,7 +116,7 @@
 
                        pmicintc: pmic@0 {
                                compatible = "qcom,pm8058";
-                               interrupt-parent = <&msmgpio>;
+                               interrupt-parent = <&tlmm>;
                                interrupts = <88 8>;
                                #interrupt-cells = <2>;
                                interrupt-controller;