From patchwork Fri Feb 5 12:38:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 61269 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1065301lbl; Fri, 5 Feb 2016 04:38:41 -0800 (PST) X-Received: by 10.66.100.135 with SMTP id ey7mr19772245pab.108.1454675921689; Fri, 05 Feb 2016 04:38:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e90si23809155pfj.89.2016.02.05.04.38.41; Fri, 05 Feb 2016 04:38:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbcBEMik (ORCPT + 1 other); Fri, 5 Feb 2016 07:38:40 -0500 Received: from mail-lb0-f171.google.com ([209.85.217.171]:33265 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572AbcBEMik (ORCPT ); Fri, 5 Feb 2016 07:38:40 -0500 Received: by mail-lb0-f171.google.com with SMTP id x4so49589717lbm.0 for ; Fri, 05 Feb 2016 04:38:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=W9lzdv4cDRqQAT8bFi7euSPmjgIDqPXhbOL7asMVIUE=; b=M9BvWJB7WbL+i1T8iXawyc2zmZG2+hodi1P++9wMitR1VJaGpMinRXND+Pq3pm7wTk cmoHHIQMfxphODCm4C91t+xMIJUCF/lZiVkLfthb5HkpCgJww4LqKJfuoJbpGFVlBsV8 ++E0y+D/43np+y0Esh1i1h8zCarl0ojkRsm/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=W9lzdv4cDRqQAT8bFi7euSPmjgIDqPXhbOL7asMVIUE=; b=Ufm+rArFzedAlmTYd/KLSATfDTQ54t8XI9niPOX3+y9zT6TWAh/AMstrBU11RtDvLH TB2s9G3/A5WizxA9W0/REyJPak1zShiph/tz1nca9plwO+dBkvOu9Wr6KeKBuwLZB9Hx YMW1C9IjuJLBuYgAS7TZPAnJtyAlYBpzxHQtOHQleEX/zR9whM/Ti4YcYJdbxn2RbGrW DQU071CNijL/P10R88mJalT+k2ZbacwgUX6wzaTKyqHhKYaqrEuemDNVslYHdhvunz7p VOpF7wvdbpmEEQod0HMgBeYPX1f1CaPLfhFYzsvL8tHKHiwyaWHlqaxg5+VgAmW0o8It WehA== X-Gm-Message-State: AG10YORfumGGLm57SGrotR8BAibh0EDyrGn84SLmbv5ZaZKjpOcbPdse5CZqu1hHrnTvaTr7 X-Received: by 10.112.140.1 with SMTP id rc1mr5868571lbb.112.1454675918654; Fri, 05 Feb 2016 04:38:38 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id o97sm2201296lfi.25.2016.02.05.04.38.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2016 04:38:36 -0800 (PST) From: Linus Walleij To: Andrew Duggan , Dmitry Torokhov , linux-input@vger.kernel.org Cc: Christopher Heiny , Vincent Huang , Linus Walleij Subject: [PATCH] ARM: Ux500: add synaptics RMI4 for Ux500 TVK DT Date: Fri, 5 Feb 2016 13:38:33 +0100 Message-Id: <1454675913-10165-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This adds the Synaptics RMI4 touchscreen to the Ux500 TVK user interface board. Tested on the U8500 HREFv60plus with the TVK UIB. Signed-off-by: Linus Walleij --- I will merge this through the ARM SoC tree, just looking for ACKs from Andrew et al, maybe an indication from Dmitry if the RMI4 stuff will be merged so I can apply this too. --- arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index b7b4211c5353..55f9d0cc90f3 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -37,7 +37,6 @@ }; soc { - /* Add Synaptics touch screen, TC35893 keypad etc here */ i2c@80004000 { tc35893@44 { compatible = "toshiba,tc35893"; @@ -159,6 +158,33 @@ vddio-supply = <&db8500_vsmps2_reg>; }; }; + + i2c@80110000 { + synaptics@4b { + /* Synaptics RMI4 TM1217 touchscreen */ + compatible = "syna,rmi4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x4b>; + vdd-supply = <&ab8500_ldo_aux1_reg>; + vddio-supply = <&db8500_vsmps2_reg>; + pinctrl-names = "default"; + pinctrl-0 = <&synaptics_tvk_mode>; + interrupt-parent = <&gpio2>; + interrupts = <20 IRQ_TYPE_EDGE_FALLING>; + + rmi-f01@1 { + reg = <0x1>; + syna,nosleep = <1>; + }; + rmi-f11@11 { + reg = <0x11>; + touchscreen-inverted-x; + syna,sensor-type = <1>; + }; + }; + }; + pinctrl { /* Pull up this GPIO pin */ tc35893 { @@ -212,6 +238,15 @@ }; }; }; + synaptics { + synaptics_tvk_mode: synaptics_tvk { + /* Touchscreen uses GPIO 84 */ + tvk_cfg1 { + pins = "GPIO84_C2"; + ste,config = <&gpio_in_pu>; + }; + }; + }; }; }; };