arm: dts: qcom: msm8660: add interrupt controller properties

Add interrupt controller properties now that ssbi-gpio is a proper
hierarchical IRQ chip. The interrupts property is no longer needed so
remove it.

This change was tested on an APQ8060 DragonBoard.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index 7069894..a4eeebc 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -285,51 +285,8 @@
                                        compatible = "qcom,pm8058-gpio",
                                                     "qcom,ssbi-gpio";
                                        reg = <0x150>;
-                                       interrupt-parent = <&pm8058>;
-                                       interrupts = <192 IRQ_TYPE_NONE>,
-                                                    <193 IRQ_TYPE_NONE>,
-                                                    <194 IRQ_TYPE_NONE>,
-                                                    <195 IRQ_TYPE_NONE>,
-                                                    <196 IRQ_TYPE_NONE>,
-                                                    <197 IRQ_TYPE_NONE>,
-                                                    <198 IRQ_TYPE_NONE>,
-                                                    <199 IRQ_TYPE_NONE>,
-                                                    <200 IRQ_TYPE_NONE>,
-                                                    <201 IRQ_TYPE_NONE>,
-                                                    <202 IRQ_TYPE_NONE>,
-                                                    <203 IRQ_TYPE_NONE>,
-                                                    <204 IRQ_TYPE_NONE>,
-                                                    <205 IRQ_TYPE_NONE>,
-                                                    <206 IRQ_TYPE_NONE>,
-                                                    <207 IRQ_TYPE_NONE>,
-                                                    <208 IRQ_TYPE_NONE>,
-                                                    <209 IRQ_TYPE_NONE>,
-                                                    <210 IRQ_TYPE_NONE>,
-                                                    <211 IRQ_TYPE_NONE>,
-                                                    <212 IRQ_TYPE_NONE>,
-                                                    <213 IRQ_TYPE_NONE>,
-                                                    <214 IRQ_TYPE_NONE>,
-                                                    <215 IRQ_TYPE_NONE>,
-                                                    <216 IRQ_TYPE_NONE>,
-                                                    <217 IRQ_TYPE_NONE>,
-                                                    <218 IRQ_TYPE_NONE>,
-                                                    <219 IRQ_TYPE_NONE>,
-                                                    <220 IRQ_TYPE_NONE>,
-                                                    <221 IRQ_TYPE_NONE>,
-                                                    <222 IRQ_TYPE_NONE>,
-                                                    <223 IRQ_TYPE_NONE>,
-                                                    <224 IRQ_TYPE_NONE>,
-                                                    <225 IRQ_TYPE_NONE>,
-                                                    <226 IRQ_TYPE_NONE>,
-                                                    <227 IRQ_TYPE_NONE>,
-                                                    <228 IRQ_TYPE_NONE>,
-                                                    <229 IRQ_TYPE_NONE>,
-                                                    <230 IRQ_TYPE_NONE>,
-                                                    <231 IRQ_TYPE_NONE>,
-                                                    <232 IRQ_TYPE_NONE>,
-                                                    <233 IRQ_TYPE_NONE>,
-                                                    <234 IRQ_TYPE_NONE>,
-                                                    <235 IRQ_TYPE_NONE>;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
                                        gpio-controller;
                                        #gpio-cells = <2>;