Skip to content

Commit

Permalink
ARM: dts: set up trigger type for edt-ft5x06 interrupts
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Sep 28, 2015
1 parent f0bef75 commit 09bb431
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am437x-sk-evm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@

reg = <0x38>;
interrupt-parent = <&gpio0>;
interrupts = <31 0>;
interrupts = <31 IRQ_TYPE_EDGE_FALLING>;

reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/imx28-tx28.dts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/dts-v1/;
#include "imx28.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>

/ {
model = "Ka-Ro electronics TX28 module";
Expand Down Expand Up @@ -324,7 +325,7 @@
pinctrl-names = "default";
pinctrl-0 = <&tx28_edt_ft5x06_pins>;
interrupt-parent = <&gpio2>;
interrupts = <5 0>;
interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/imx53-tx53-x03x.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/dts-v1/;
#include "imx53-tx53.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h>

/ {
Expand Down Expand Up @@ -216,7 +217,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_edt_ft5x06_1>;
interrupt-parent = <&gpio6>;
interrupts = <15 0>;
interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/imx6qdl-tx6.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h>

/ {
Expand Down Expand Up @@ -272,7 +273,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_edt_ft5x06>;
interrupt-parent = <&gpio6>;
interrupts = <15 0>;
interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
linux,wakeup;
Expand Down

0 comments on commit 09bb431

Please sign in to comment.