From patchwork Sat Sep 12 17:45:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 7166971 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 996BA9F506 for ; Sat, 12 Sep 2015 17:46:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1ED8207C2 for ; Sat, 12 Sep 2015 17:46:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAF03207C1 for ; Sat, 12 Sep 2015 17:46:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755076AbbILRqI (ORCPT ); Sat, 12 Sep 2015 13:46:08 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35526 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755041AbbILRp7 (ORCPT ); Sat, 12 Sep 2015 13:45:59 -0400 Received: by pacfv12 with SMTP id fv12so105447195pac.2; Sat, 12 Sep 2015 10:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=oKs6IWWLxjwkaPIR488bHQ9A+UUYObFnHxMOPtVaNWk=; b=GBvoEQdRDSKhd+Qj8IVMzvkRsN3ZI7m2viKr1VdLUcrG/uQGpB36CXHvM/zhzmOPJ9 88eh9/PkuR72lUPo2YakXw0vRCX36IpSrifhPJK2BrdtgK2LBOI6BHXC/6hML45LqGJa c/wsnRRp4XoeMKrjfJ66cz9V/AHaxKuGmintlUgsFqz7u5jlnKHfkCJ2LqT6BRRZmKx6 d0WyxSCn3gzh4cOpaKZclCjmTA5F6/q4Klnk0kiG12utZLjRXb0kogCCeWkwtQ7uLGCb RFAKh5gx88YV/+Ad9gA+hKTLDOqmhOP0f9GrlU3SO5ZgGIbBDbiatO9sNYJkSrqmrsTD 3KiA== X-Received: by 10.68.249.36 with SMTP id yr4mr12333815pbc.18.1442079958725; Sat, 12 Sep 2015 10:45:58 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([172.22.64.149]) by smtp.gmail.com with ESMTPSA id zn9sm7008525pac.11.2015.09.12.10.45.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Sep 2015 10:45:58 -0700 (PDT) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Franklin S Cooper Jr , Maxime Ripard , =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= , Tony Lindgren , Rob Herring , Pawel Moll , Shawn Guo , Sascha Hauer , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] ARM: dts: set up trigger type for edt-ft5x06 interrupts Date: Sat, 12 Sep 2015 10:45:51 -0700 Message-Id: <2adcbfd1d5b237598d37edcbeec4a8dbd443f36f.1442079408.git.dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.6.0.rc0.131.gf624c3d In-Reply-To: <5044530af510d6686e78f8dfa912d89ef824f899.1442079408.git.dmitry.torokhov@gmail.com> References: <5044530af510d6686e78f8dfa912d89ef824f899.1442079408.git.dmitry.torokhov@gmail.com> In-Reply-To: <5044530af510d6686e78f8dfa912d89ef824f899.1442079408.git.dmitry.torokhov@gmail.com> References: <5044530af510d6686e78f8dfa912d89ef824f899.1442079408.git.dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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). Signed-off-by: Dmitry Torokhov Acked-by: Felipe Balbi Acked-by: Tony Lindgren Acked-by: Shawn Guo --- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/imx28-tx28.dts | 3 ++- arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 ++- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 ++- 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 c17097d..d83fdcd 100644 --- a/arch/arm/boot/dts/am437x-sk-evm.dts +++ b/arch/arm/boot/dts/am437x-sk-evm.dts @@ -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>; diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index a5b27c8..4ea8934 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts @@ -13,6 +13,7 @@ /dts-v1/; #include "imx28.dtsi" #include +#include / { model = "Ka-Ro electronics TX28 module"; @@ -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>; }; diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts index 3b73e81..13e842b 100644 --- a/arch/arm/boot/dts/imx53-tx53-x03x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts @@ -12,6 +12,7 @@ /dts-v1/; #include "imx53-tx53.dtsi" #include +#include #include / { @@ -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>; }; diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index da08de3..13cb7cc 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -11,6 +11,7 @@ #include #include +#include #include / { @@ -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;