ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4210

Interrupt of type IRQ_TYPE_NONE is not allowed for GIC interrupts and
generates an error:
	genirq: Setting trigger mode 0 for irq 16 failed (gic_set_type+0x0/0x68)

The GIC requires shared interrupts to be edge rising or level high.
Platform declares support for both.  Arbitrarily choose level high
everywhere hoping it will work on each platform.

Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: Alban Browaeys <alban.browaeys@gmail.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>

diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index d9b6d25e4abe392de26ec5dfa4dbe8c20f147683..264b43228cfd61f8985b33a33494be1e3950999a 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -537,8 +537,14 @@
 
                        interrupt-controller;
                        interrupt-parent = <&gic>;
-                       interrupts = <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,
-                                    <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>;
+                       interrupts = <0 16 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 17 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 18 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 19 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 20 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 21 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 22 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 23 IRQ_TYPE_LEVEL_HIGH>;
                        #interrupt-cells = <2>;
                };
 
@@ -548,8 +554,14 @@
 
                        interrupt-controller;
                        interrupt-parent = <&gic>;
-                       interrupts = <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
-                                    <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
+                       interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 25 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 26 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 27 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 28 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 29 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 30 IRQ_TYPE_LEVEL_HIGH>,
+                                    <0 31 IRQ_TYPE_LEVEL_HIGH>;
                        #interrupt-cells = <2>;
                };
 

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 2d9b02967105fd7e9320adba5625d4e5bb2a0be4..736ab8587ab03db61411dd56c4b1e26e9a81a1ce 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -109,12 +109,12 @@
                        #interrupt-cells = <1>;
                        #address-cells = <0>;
                        #size-cells = <0>;
-                       interrupt-map = <0 &gic 0 57 0>,
-                                       <1 &gic 0 69 0>,
+                       interrupt-map = <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
+                                       <1 &gic 0 69 IRQ_TYPE_LEVEL_HIGH>,
                                        <2 &combiner 12 6>,
                                        <3 &combiner 12 7>,
-                                       <4 &gic 0 42 0>,
-                                       <5 &gic 0 48 0>;
+                                       <4 &gic 0 42 IRQ_TYPE_LEVEL_HIGH>,
+                                       <5 &gic 0 48 IRQ_TYPE_LEVEL_HIGH>;
                };
        };
 
@@ -127,18 +127,18 @@
        pinctrl_0: pinctrl@11400000 {
                compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11400000 0x1000>;
-               interrupts = <0 47 0>;
+               interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
        };
 
        pinctrl_1: pinctrl@11000000 {
                compatible = "samsung,exynos4210-pinctrl";
                reg = <0x11000000 0x1000>;
-               interrupts = <0 46 0>;
+               interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 
                wakup_eint: wakeup-interrupt-controller {
                        compatible = "samsung,exynos4210-wakeup-eint";
                        interrupt-parent = <&gic>;
-                       interrupts = <0 32 0>;
+                       interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>;
                };
        };
 
@@ -182,7 +182,7 @@
        g2d: g2d@12800000 {
                compatible = "samsung,s5pv210-g2d";
                reg = <0x12800000 0x1000>;
-               interrupts = <0 89 0>;
+               interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                clock-names = "sclk_fimg2d", "fimg2d";
                power-domains = <&pd_lcd0>;
@@ -424,10 +424,22 @@
 
 &combiner {
        samsung,combiner-nr = <16>;
-       interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
-                    <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
-                    <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
-                    <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
+       interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 1 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 2 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 3 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 4 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 5 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 6 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 7 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 8 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 9 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 10 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 11 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 12 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 13 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 14 IRQ_TYPE_LEVEL_HIGH>,
+                    <0 15 IRQ_TYPE_LEVEL_HIGH>;
 };
 
 &mdma1 {