ARM: dts: imx6qdl-gw5xxx: correct interrupt flags

GPIO_ACTIVE_x flags are not correct in the context of interrupt flags.
These are simple defines so they could be used in DTS but they will not
have the same meaning:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW  = 1 = IRQ_TYPE_EDGE_RISING

Correct the interrupt flags, assuming the author of the code wanted same
logical behavior behind the name "ACTIVE_xxx", this is:
  ACTIVE_LOW  => IRQ_TYPE_LEVEL_LOW

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-By: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
index 7705285d9e3c7de096fab0c696534fa78c384337..e98935974b5d54523bc32fa6acd368c52061d96b 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -154,7 +155,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index f6182a9d201c866f4609732aec216726a9f8d5ad..736074f1c3ef940c101160dcd5f0e79c56baebaa 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -217,7 +218,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index a28e79463d0cad18fdba69c2f0740928f34af6bf..8072ed47c6bb21250fe50249f0449c6809c6e405 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -210,7 +211,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 55f368e192c0730821e873c8300535e3e43dd0db..8c9bcdd39830b2d1e160257044d10be03aa9d944 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
@@ -247,7 +248,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index 1516e2b0bcde4f11fe5bf3cb232e9f63db203ff3..e5d803d023c81292f096f9210a7cffad9886d80f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@ -48,6 +48,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/media/tda1997x.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
@@ -219,7 +220,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
index 0da6e6f7482b75797a0506a353cd29d9aa093a3d..290a607fede967f24c1841e556a66163b9946e22 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -144,7 +145,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
index faf9a3ba61b22e8cc4eb3f187e2a71d434d5b8d1..c15b9cc63bf8c9888a01a0568977a58fd8663f1d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@@ -47,6 +47,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -180,7 +181,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
index f68f9dada5b08081495670b8cabbfd88b71780f2..093a219a77ae188fa300cd81311d8b9ecc30a650 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
@@ -47,6 +47,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -294,7 +295,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
index fbe6c32bd756591e5c80581a60610800785df26f..e1c8dd233cab3cb5b2984fe123a0b9271cb407bf 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
@@ -47,6 +47,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        chosen {
@@ -235,7 +236,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
index 23c6e4047621088929b0c6efac3dcd5f41ad9537..3cd2e717c1daaaf8fe9b8f927b3718be6d4b47b7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@@ -47,6 +47,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -257,7 +258,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5907.dtsi b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
index b1ff7c859c4d51181ffeea00ed4cc91925676972..21c68a55bcb994b13e1f79066e442daeefadae42 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -154,7 +155,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
index 6c943a517ad76753cc30902f2547b5a75e957354..ed4e2225995941194983e532bc9e0847ef4b2a47 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -163,7 +164,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5912.dtsi b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
index 441d8ce97aa4875255890bc10d793f18c4a6c9f9..797f160249f787d02f0295820846dafbc4df5261 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -158,7 +159,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6qdl-gw5913.dtsi b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
index d62a8da493670ed7070bb925b833329405b9a2ec..4cd7d290f5b28f6240411b3b690fa8ad33c988c7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
        /* these are used by bootloader for disabling nodes */
@@ -139,7 +140,7 @@
                compatible = "gw,gsc";
                reg = <0x20>;
                interrupt-parent = <&gpio1>;
-               interrupts = <4 GPIO_ACTIVE_LOW>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                #size-cells = <0>;