ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058

The name "pmicintc" is ambiguous: there is a second power
management IC named PM8901 on these systems, and it is also
an interrupt controller. To make things clear, just name the
node alias "pm8058", this in unambigous and has all information
we need.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
index 4b8872cc8bf935393550c2f6b04c7d0ba50ae0c1..4a532ddab53a43c346c0cf8920f223be5e7ffd49 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
@@ -412,7 +412,7 @@
                                 * The second interrupt is the PME interrupt
                                 * for network wakeup, connected to the TLMM.
                                 */
-                               interrupts-extended = <&pmicintc 198 IRQ_TYPE_EDGE_FALLING>,
+                               interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>,
                                                    <&tlmm 29 IRQ_TYPE_EDGE_RISING>;
                                reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
                                vdd33a-supply = <&dragon_veth>;

diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 23de764558abef44b67570c6001450595f02906e..1adc04978a47fe575ddd30e601f58fb4c5663e1a 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -48,7 +48,7 @@
        };
 };
 
-&pmicintc {
+&pm8058 {
        keypad@148 {
                linux,keymap = <
                        MATRIX_KEY(0, 0, KEY_FN_F1)

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index 4d828f810746872da14fe49c204462c3b11c983e..91c9a62ae7250184147c9750e417d39f54915827 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -163,7 +163,7 @@
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
 
-                       pmicintc: pmic@0 {
+                       pm8058: pmic@0 {
                                compatible = "qcom,pm8058";
                                interrupt-parent = <&tlmm>;
                                interrupts = <88 8>;
@@ -176,7 +176,7 @@
                                        compatible = "qcom,pm8058-gpio",
                                                     "qcom,ssbi-gpio";
                                        reg = <0x150>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8058>;
                                        interrupts = <192 IRQ_TYPE_NONE>,
                                                     <193 IRQ_TYPE_NONE>,
                                                     <194 IRQ_TYPE_NONE>,
@@ -232,7 +232,7 @@
                                        reg = <0x50>;
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8058>;
                                        interrupts =
                                        <128 IRQ_TYPE_NONE>,
                                        <129 IRQ_TYPE_NONE>,
@@ -251,7 +251,7 @@
                                pwrkey@1c {
                                        compatible = "qcom,pm8058-pwrkey";
                                        reg = <0x1c>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8058>;
                                        interrupts = <50 1>, <51 1>;
                                        debounce = <15625>;
                                        pull-up;
@@ -260,7 +260,7 @@
                                keypad@148 {
                                        compatible = "qcom,pm8058-keypad";
                                        reg = <0x148>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8058>;
                                        interrupts = <74 1>, <75 1>;
                                        debounce = <15>;
                                        scan-delay = <32>;
@@ -270,7 +270,7 @@
                                rtc@1e8 {
                                        compatible = "qcom,pm8058-rtc";
                                        reg = <0x1e8>;
-                                       interrupt-parent = <&pmicintc>;
+                                       interrupt-parent = <&pm8058>;
                                        interrupts = <39 1>;
                                        allow-set-time;
                                };