aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-09-12 13:22:55 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-09-27 20:34:01 -0400
commit09bb431951f7d339bf5ef7179ae807e519928121 (patch)
treeb4df88e6f3d0cb09fe014448bf95e0839e359774
parentf0bef75c593391198f2c9f855aae8e994a0e9293 (diff)
ARM: dts: set up trigger type for edt-ft5x06 interrupts
Now that the driver respects IRQ trigger settings from device tree, let's fix them up in individual DTSes (note that the driver is still compatible with older DTSes). Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--arch/arm/boot/dts/am437x-sk-evm.dts2
-rw-r--r--arch/arm/boot/dts/imx28-tx28.dts3
-rw-r--r--arch/arm/boot/dts/imx53-tx53-x03x.dts3
-rw-r--r--arch/arm/boot/dts/imx6qdl-tx6.dtsi3
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index c17097d2c167..d83fdcd4eba2 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -471,7 +471,7 @@
471 471
472 reg = <0x38>; 472 reg = <0x38>;
473 interrupt-parent = <&gpio0>; 473 interrupt-parent = <&gpio0>;
474 interrupts = <31 0>; 474 interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
475 475
476 reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; 476 reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
477 477
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index a5b27c85a91c..4ea89344a5ff 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -13,6 +13,7 @@
13/dts-v1/; 13/dts-v1/;
14#include "imx28.dtsi" 14#include "imx28.dtsi"
15#include <dt-bindings/gpio/gpio.h> 15#include <dt-bindings/gpio/gpio.h>
16#include <dt-bindings/interrupt-controller/irq.h>
16 17
17/ { 18/ {
18 model = "Ka-Ro electronics TX28 module"; 19 model = "Ka-Ro electronics TX28 module";
@@ -324,7 +325,7 @@
324 pinctrl-names = "default"; 325 pinctrl-names = "default";
325 pinctrl-0 = <&tx28_edt_ft5x06_pins>; 326 pinctrl-0 = <&tx28_edt_ft5x06_pins>;
326 interrupt-parent = <&gpio2>; 327 interrupt-parent = <&gpio2>;
327 interrupts = <5 0>; 328 interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
328 reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; 329 reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
329 wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>; 330 wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
330 }; 331 };
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 3b73e81dc3f0..13e842b0c785 100644
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -12,6 +12,7 @@
12/dts-v1/; 12/dts-v1/;
13#include "imx53-tx53.dtsi" 13#include "imx53-tx53.dtsi"
14#include <dt-bindings/input/input.h> 14#include <dt-bindings/input/input.h>
15#include <dt-bindings/interrupt-controller/irq.h>
15#include <dt-bindings/pwm/pwm.h> 16#include <dt-bindings/pwm/pwm.h>
16 17
17/ { 18/ {
@@ -216,7 +217,7 @@
216 pinctrl-names = "default"; 217 pinctrl-names = "default";
217 pinctrl-0 = <&pinctrl_edt_ft5x06_1>; 218 pinctrl-0 = <&pinctrl_edt_ft5x06_1>;
218 interrupt-parent = <&gpio6>; 219 interrupt-parent = <&gpio6>;
219 interrupts = <15 0>; 220 interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
220 reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; 221 reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
221 wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 222 wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
222 }; 223 };
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index f02b80b41d4f..35178f2cdbf0 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -11,6 +11,7 @@
11 11
12#include <dt-bindings/gpio/gpio.h> 12#include <dt-bindings/gpio/gpio.h>
13#include <dt-bindings/input/input.h> 13#include <dt-bindings/input/input.h>
14#include <dt-bindings/interrupt-controller/irq.h>
14#include <dt-bindings/pwm/pwm.h> 15#include <dt-bindings/pwm/pwm.h>
15 16
16/ { 17/ {
@@ -272,7 +273,7 @@
272 pinctrl-names = "default"; 273 pinctrl-names = "default";
273 pinctrl-0 = <&pinctrl_edt_ft5x06>; 274 pinctrl-0 = <&pinctrl_edt_ft5x06>;
274 interrupt-parent = <&gpio6>; 275 interrupt-parent = <&gpio6>;
275 interrupts = <15 0>; 276 interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
276 reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; 277 reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
277 wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 278 wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
278 linux,wakeup; 279 linux,wakeup;