ARM: dts: ux500: Fix interrupt cells

[ Upstream commit e4ff0112a03c2e353c8457cd33c88feb89dfec41 ]

Fix interrupt cells in DT AB8500/AB8505 source files. The
compiled DTB files will stay the same.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi
index aab5719..5fde474 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8500.dtsi
+++ b/arch/arm/boot/dts/ste-ab8500.dtsi
@@ -42,15 +42,15 @@
 
                                ab8500-rtc {
                                        compatible = "stericsson,ab8500-rtc";
-                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH
-                                                     18 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <18 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "60S", "ALARM";
                                };
 
                                gpadc: ab8500-gpadc {
                                        compatible = "stericsson,ab8500-gpadc";
-                                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH
-                                                     39 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <39 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "HW_CONV_END", "SW_CONV_END";
                                        vddadc-supply = <&ab8500_ldo_tvout_reg>;
                                        #address-cells = <1>;
@@ -169,13 +169,13 @@
 
                                ab8500_usb {
                                        compatible = "stericsson,ab8500-usb";
-                                       interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
-                                                      96 IRQ_TYPE_LEVEL_HIGH
-                                                      14 IRQ_TYPE_LEVEL_HIGH
-                                                      15 IRQ_TYPE_LEVEL_HIGH
-                                                      79 IRQ_TYPE_LEVEL_HIGH
-                                                      74 IRQ_TYPE_LEVEL_HIGH
-                                                      75 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <96 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <14 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <15 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <79 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <74 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <75 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "ID_WAKEUP_R",
                                                          "ID_WAKEUP_F",
                                                          "VBUS_DET_F",
@@ -192,8 +192,8 @@
 
                                ab8500-ponkey {
                                        compatible = "stericsson,ab8500-poweron-key";
-                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH
-                                                     7 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <7 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
                                };
 

diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi
index 67bc69e..dbaedda 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-ab8505.dtsi
@@ -38,8 +38,8 @@
 
                                ab8500-rtc {
                                        compatible = "stericsson,ab8500-rtc";
-                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH
-                                                     18 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <18 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "60S", "ALARM";
                                };
 
@@ -131,13 +131,13 @@
 
                                ab8500_usb: ab8500_usb {
                                        compatible = "stericsson,ab8500-usb";
-                                       interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
-                                                      96 IRQ_TYPE_LEVEL_HIGH
-                                                      14 IRQ_TYPE_LEVEL_HIGH
-                                                      15 IRQ_TYPE_LEVEL_HIGH
-                                                      79 IRQ_TYPE_LEVEL_HIGH
-                                                      74 IRQ_TYPE_LEVEL_HIGH
-                                                      75 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <96 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <14 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <15 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <79 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <74 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <75 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "ID_WAKEUP_R",
                                                          "ID_WAKEUP_F",
                                                          "VBUS_DET_F",
@@ -154,8 +154,8 @@
 
                                ab8500-ponkey {
                                        compatible = "stericsson,ab8500-poweron-key";
-                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH
-                                                     7 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
+                                                    <7 IRQ_TYPE_LEVEL_HIGH>;
                                        interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
                                };