ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree

The AB8500 driver has now been provided with IRQ domain support. This
means we can request IRQs from any of it's uses via Device Tree. This
patch advertises the AB8500 as an Interrupt Controller and provides the
correct calls in the format the driver expects.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 9669e72..d698bd8 100644 (file)
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -312,24 +312,26 @@
                                compatible = "stericsson,ab8500";
                                reg = <5>; /* mailbox 5 is i2c */
                                interrupts = <0 40 0x4>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
 
                                ab8500-gpadc {
                                        compatible = "stericsson,ab8500-gpadc";
-                                       interrupts = <0 32 0x4
-                                                     0 39 0x4>;
+                                       interrupts = <32 0x4
+                                                     39 0x4>;
                                        interrupt-names = "HW_CONV_END", "SW_CONV_END";
                                        vddadc-supply = <&ab8500_ldo_tvout_reg>;
                                };
 
                                ab8500-usb {
                                        compatible = "stericsson,ab8500-usb";
-                                       interrupts = < 0 90 0x4
-                                                      0 96 0x4
-                                                      0 14 0x4
-                                                      0 15 0x4
-                                                      0 79 0x4
-                                                      0 74 0x4
-                                                      0 75 0x4>;
+                                       interrupts = < 90 0x4
+                                                      96 0x4
+                                                      14 0x4
+                                                      15 0x4
+                                                      79 0x4
+                                                      74 0x4
+                                                      75 0x4>;
                                        interrupt-names = "ID_WAKEUP_R",
                                                          "ID_WAKEUP_F",
                                                          "VBUS_DET_F",
@@ -344,8 +346,8 @@
 
                                ab8500-ponkey {
                                        compatible = "stericsson,ab8500-ponkey";
-                                       interrupts = <0 6 0x4
-                                                     0 7 0x4>;
+                                       interrupts = <6 0x4
+                                                     7 0x4>;
                                        interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
                                };