diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-12 18:58:21 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-12 18:58:21 +0100 |
| commit | ff6d03b9d9cad592320ce21e9b22befe56ebe6b6 (patch) | |
| tree | da02d83177a107f92c446dbf7a93bdc1bac96cdf /arch/arm/boot/dts/imx6qdl-tx6.dtsi | |
| parent | bus: omap-ocp2scp: Fix module alias (diff) | |
| parent | ARM: OMAP: DRA7: hwmod: Add data for McASP3 (diff) | |
| download | linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.tar.xz linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.zip | |
Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-tx6.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index da08de324e9e..13cb7ccfea44 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -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> / { @@ -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; |