From patchwork Sun May 5 21:47:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13654676 Received: from mail2.andi.de1.cc (vmd64148.contaboserver.net [161.97.139.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93FA2135A73; Sun, 5 May 2024 21:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=161.97.139.27 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945728; cv=none; b=cN1lwW6Pf/lqqZrmdkSYNL7nEl/bMgAfUQs/g0u5fz/sKTEcyy+RyneVur+fLxOBvnyAhage1hIEFvV27Qso0Y4KpWE3p6rrgprEjiIPoTCTdW6KaA4qALtha5FKyMJ1y0sXxWcmdeVNiTWbFThfNEPEEV0nZyeKBirLbvbeoUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945728; c=relaxed/simple; bh=JqftZOBROHB7NDMLLUBkN2gSJoBeMNEhVZ+5p5CrOTY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AQ1cIM+k2lnq0UoiVjHeOIczh/8TgF4NpUeohganhFBqw+Og1fYLcQSaXzwc1TrPQYJ6Cq7hP/AEDAsNvA4NqWpsbtnpztI0PYMM/Tg1vX3ZUko/KuomwnNFI76XH/lXcMbDNIbU+LceqRfOA75r6vKb2ihvZe1uCivkSsoBHxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info; spf=pass smtp.mailfrom=kemnade.info; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b=qMSfeUDM; arc=none smtp.client-ip=161.97.139.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kemnade.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b="qMSfeUDM" Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by mail2.andi.de1.cc with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jiq-005kk0-15; Sun, 05 May 2024 23:48:41 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20220719; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=yXjkb0l1HEEZRrAe8oSGj/9/GnOCVXNmuf6WaMu1Sk4=; b=qMSfeUDM8/+UHT0PZMHAAGYAj2 tJ2TRUnSwLsFPo/6wkjt9BZBpoBavtrDccVRGYwoki6zf6rMbMKG5o8lO1BxA0PhKuOpUTxcAzlXg 2RFmCQNei0rlZQm75e8lyE5otXXonQyEgT1n5Vq2/0UXmeqxbsn5bIPvFZGNNqeqJtsLcuDQN0BMg yyXhweKVTqGT4NIGxUdciDJaBspP7hQqAvfwoQNNsdGAIjWKbT0kZGXHF7fUeDntugBBipCeuDtH9 BIKitK1wP/DU4Uc74nYio3N6wWtXlUl5r0Rog31gHeYxMHzcVH6AyoPh6J/ape4o1i5eQ3lnLGqSI DiCKS6Ww==; Received: from p200300c20737c2001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:c2:737:c200:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jim-000cc8-1b; Sun, 05 May 2024 23:48:37 +0200 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1s3jin-003jyV-1c; Sun, 05 May 2024 23:48:37 +0200 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andreas@kemnade.info, u.kleine-koenig@pengutronix.de, hdegoede@redhat.com, andy.shevchenko@gmail.com, siebren.vroegindeweij@hotmail.com, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] dt-bindings: touchscreen: convert elan,ektf2127 to json-schema Date: Sun, 5 May 2024 23:47:52 +0200 Message-Id: <20240505214754.891700-2-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240505214754.891700-1-andreas@kemnade.info> References: <20240505214754.891700-1-andreas@kemnade.info> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert EKTF2127 infrared touchscreen controller binding to DT schema and add ektf2232 compatible. Signed-off-by: Andreas Kemnade Reviewed-by: Krzysztof Kozlowski --- .../bindings/input/touchscreen/ektf2127.txt | 25 -------- .../input/touchscreen/elan,ektf2127.yaml | 57 +++++++++++++++++++ 2 files changed, 57 insertions(+), 25 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ektf2127.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml diff --git a/Documentation/devicetree/bindings/input/touchscreen/ektf2127.txt b/Documentation/devicetree/bindings/input/touchscreen/ektf2127.txt deleted file mode 100644 index c9f2c9f578e34..0000000000000 --- a/Documentation/devicetree/bindings/input/touchscreen/ektf2127.txt +++ /dev/null @@ -1,25 +0,0 @@ -* Elan eKTF2127 I2C touchscreen controller - -Required properties: - - compatible : "elan,ektf2127" or "elan,ektf2132" - - reg : I2C slave address of the chip (0x40) - - interrupts : interrupt specification for the ektf2127 interrupt - - power-gpios : GPIO specification for the pin connected to the - ektf2127's wake input. This needs to be driven high - to take ektf2127 out of its low power state - -For additional optional properties see: touchscreen.txt - -Example: - -i2c@00000000 { - ektf2127: touchscreen@15 { - compatible = "elan,ektf2127"; - reg = <0x15>; - interrupt-parent = <&pio>; - interrupts = <6 11 IRQ_TYPE_EDGE_FALLING> - power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; - touchscreen-inverted-x; - touchscreen-swapped-x-y; - }; -}; diff --git a/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml b/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml new file mode 100644 index 0000000000000..5c4c29da0b11d --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen/elan,ektf2127.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Elan eKTF2127 I2C touchscreen controller + +maintainers: + - Siebren Vroegindeweij + +allOf: + - $ref: touchscreen.yaml# + +properties: + compatible: + enum: + - elan,ektf2127 + - elan,ektf2132 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-gpios: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - power-gpios + +unevaluatedProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + touchscreen@15 { + compatible = "elan,ektf2127"; + reg = <0x15>; + interrupt-parent = <&pio>; + interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; + power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; + touchscreen-inverted-x; + touchscreen-swapped-x-y; + }; + }; +... From patchwork Sun May 5 21:47:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13654678 Received: from mail2.andi.de1.cc (vmd64148.contaboserver.net [161.97.139.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93FF713667B; Sun, 5 May 2024 21:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=161.97.139.27 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945729; cv=none; b=RsWyXqNwDbUEnu+yw1IrGPUE9SpaC8brH6L4rIM6netovT7kdBXI7/fnY8RICQ1EWAAU6xal7l2uLyiGxm0y7k4HrBir4PoN4aR7cdjWPn6wcyjFz/NGbB2Mfpo4h32Of7lxB0wiTmE3y9uZ67Y0/IY4LZea8QCBQblqp8EKc1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945729; c=relaxed/simple; bh=BfcYcy+g5vRGOxT7Eyza/k94pC5vxujBJ5vBukv4+3k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UhVYDw6++pJJzBQoqj8RDpsEvVlor9Jvw6Luq3cBs7xt79HUIl4XqTwxNJnyk10oFvQH75bbZ321+4dcUfJqezXESyAXx5RNr8WnSJWZbWRLtvL2wYOtUWMvqsNfW9MHM+mbhYpzBTTTiYoVJJmfRGYT8hGWVy+6A1YHhFStCyI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info; spf=pass smtp.mailfrom=kemnade.info; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b=ghfZolh6; arc=none smtp.client-ip=161.97.139.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kemnade.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b="ghfZolh6" Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by mail2.andi.de1.cc with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jir-005kk8-00; Sun, 05 May 2024 23:48:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20220719; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jq4ul0HfMwHbZAQBdcNVCPfCEbXvT0e+cZ1ly+iFADg=; b=ghfZolh67wT6xBtCcovtqzmdV/ 6rl1mM+e/Wh75bu2sA+cH4mnyabMno7/ruuD2l0+aAAdj/TyEC7UsVe/z3pd20dYnJUOR8pWw30mb ivWoS9TjsEjd330dpgxWHYaH5T3f865CyLjb9PvW37vbi9Oua4Y854rkE8qX9yfwuChKlJSZFqugF zMnybJ8f+cjklMpOhvg4M+HEqMrNr7c00xxnptXx/CLMaQu7Rx5APgNdPRGTfw6x4PUcLElA25H+U R84TyFjktBFSQCqc4CSZFBPBCzvv34JtfuN35mOJp78Cg6zQndUaibam3FdTW6e/+oMNOXWAcb3E0 1MrkY4gQ==; Received: from p200300c20737c2001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:c2:737:c200:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jin-000ccB-0D; Sun, 05 May 2024 23:48:38 +0200 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1s3jio-003jyb-0E; Sun, 05 May 2024 23:48:38 +0200 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andreas@kemnade.info, u.kleine-koenig@pengutronix.de, hdegoede@redhat.com, andy.shevchenko@gmail.com, siebren.vroegindeweij@hotmail.com, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] dt-bindings: touchscreen: elan,ektf2127: Add EKTF2232 Date: Sun, 5 May 2024 23:47:53 +0200 Message-Id: <20240505214754.891700-3-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240505214754.891700-1-andreas@kemnade.info> References: <20240505214754.891700-1-andreas@kemnade.info> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a compatible for the EKTF2232, which is similar to other chips in this document. Signed-off-by: Andreas Kemnade Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/input/touchscreen/elan,ektf2127.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml b/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml index 5c4c29da0b11d..ff0ec3fd24c5d 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml @@ -17,6 +17,7 @@ properties: enum: - elan,ektf2127 - elan,ektf2132 + - elan,ektf2232 reg: maxItems: 1 From patchwork Sun May 5 21:47:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13654677 Received: from mail2.andi.de1.cc (vmd64148.contaboserver.net [161.97.139.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AC13136982; Sun, 5 May 2024 21:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=161.97.139.27 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945728; cv=none; b=ofY7tWflgNQJOdAjegWiImJ1zRGtm5BZgmS8w43izKzqhypGuh9s5z+qA6TNzDxbFX4Wrm40zXRFB2Axu3NhfgLje1WjvCf00k4hVtCgW29qPoj8oDNG2wJIytkwrEAJoAukoFFKMLkEdL6PNQCN60EKZ5uCyKb7It9FXWNK1PI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714945728; c=relaxed/simple; bh=G9h5ZxiGzASTMIdvxH0uhwND+SlOLksrdHwTgbps1FY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l97wl22v/XE9ZC0FQyO+DOTp9qQwWGbBvMUvc8mtGiARvBTCOmxL5Axj7DReMNDBLnleiMCScC/BBqCmaMOs7C4sUljo3a7vI6ssbcDIynTmRZENFDUb3VEUtCEQS8uzunOIxNfbzNOb80HXS1t9vs/MqGxjok4MTxn2u1hdyq0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info; spf=pass smtp.mailfrom=kemnade.info; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b=13Kc15T3; arc=none smtp.client-ip=161.97.139.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kemnade.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kemnade.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kemnade.info header.i=@kemnade.info header.b="13Kc15T3" Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by mail2.andi.de1.cc with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jir-005kkC-1E; Sun, 05 May 2024 23:48:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kemnade.info; s=20220719; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wSAWZ7fK7sRoCuFqtN+GxwBPXM4pBzVJE8SYe+i46ys=; b=13Kc15T3+e95IK6a5RC0No20D0 MYHvfoJD2yjr2eYyZWjcbhZK1Mp9AS+8R349Y0G2jtJkH499kvBn/h8OQDuFjRc5kvPQQht4ONgEO J1vvPLdm88yRhZdXwKAIFT59pELH/J/1FHhkMg1a5GwMF9b+crSK1eevUc2mCWvNqLEbaHwdMBaJ6 c7P9mb4qm4W3MWbPzLyNYsJZ3bnXFYiPseKD02k3nsRunXlj2TDffNkuHzf1uymhXdx1w26xlFMi7 /LCANFzKUV6pJtUGEq0xkuymYc84kN3dVaSARGTLo5cRT8gj2yx3QGRXYS9X09RQePbFdQTIxC+bk 0er998wQ==; Received: from p200300c20737c2001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:c2:737:c200:1a3d:a2ff:febf:d33a] helo=aktux) by mail.andi.de1.cc with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s3jin-000ccD-2F; Sun, 05 May 2024 23:48:38 +0200 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1s3jio-003jyg-2I; Sun, 05 May 2024 23:48:38 +0200 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andreas@kemnade.info, u.kleine-koenig@pengutronix.de, hdegoede@redhat.com, andy.shevchenko@gmail.com, siebren.vroegindeweij@hotmail.com, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] Input: ektf2127 - add ektf2232 support Date: Sun, 5 May 2024 23:47:54 +0200 Message-Id: <20240505214754.891700-4-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240505214754.891700-1-andreas@kemnade.info> References: <20240505214754.891700-1-andreas@kemnade.info> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The chip is similar, but has status bits at different positions, so use the correct bits. Signed-off-by: Andreas Kemnade --- drivers/input/touchscreen/ektf2127.c | 41 ++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c index cc3103b9cbfba..028b605d1bb74 100644 --- a/drivers/input/touchscreen/ektf2127.c +++ b/drivers/input/touchscreen/ektf2127.c @@ -13,6 +13,7 @@ * Hans de Goede */ +#include #include #include #include @@ -46,6 +47,11 @@ struct ektf2127_ts { struct input_dev *input; struct gpio_desc *power_gpios; struct touchscreen_properties prop; + int status_shift; +}; + +struct ektf2127_i2c_chip_data { + int status_shift; }; static void ektf2127_parse_coordinates(const u8 *buf, unsigned int touch_count, @@ -112,8 +118,8 @@ static void ektf2127_report2_contact(struct ektf2127_ts *ts, int slot, static void ektf2127_report2_event(struct ektf2127_ts *ts, const u8 *buf) { - ektf2127_report2_contact(ts, 0, &buf[1], !!(buf[7] & 2)); - ektf2127_report2_contact(ts, 1, &buf[4], !!(buf[7] & 4)); + ektf2127_report2_contact(ts, 0, &buf[1], !!(buf[7] & BIT(ts->status_shift))); + ektf2127_report2_contact(ts, 1, &buf[4], !!(buf[7] & BIT(ts->status_shift + 1))); input_mt_sync_frame(ts->input); input_sync(ts->input); @@ -246,7 +252,9 @@ static int ektf2127_query_dimension(struct i2c_client *client, bool width) static int ektf2127_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; + const struct ektf2127_i2c_chip_data *chip_data; struct ektf2127_ts *ts; struct input_dev *input; u8 buf[4]; @@ -303,6 +311,17 @@ static int ektf2127_probe(struct i2c_client *client) return error; ts->input = input; + + chip_data = device_get_match_data(&client->dev); + if (!chip_data) + chip_data = (const struct ektf2127_i2c_chip_data *)id->driver_data; + if (!chip_data) { + dev_err(&client->dev, "missing chip data\n"); + return -EINVAL; + } + + ts->status_shift = chip_data->status_shift; + input_set_drvdata(input, ts); error = devm_request_threaded_irq(dev, client->irq, @@ -325,18 +344,28 @@ static int ektf2127_probe(struct i2c_client *client) return 0; } +static const struct ektf2127_i2c_chip_data ektf2127_data = { + .status_shift = 1, +}; + +static const struct ektf2127_i2c_chip_data ektf2232_data = { + .status_shift = 0, +}; + #ifdef CONFIG_OF static const struct of_device_id ektf2127_of_match[] = { - { .compatible = "elan,ektf2127" }, - { .compatible = "elan,ektf2132" }, + { .compatible = "elan,ektf2127", .data = &ektf2127_data}, + { .compatible = "elan,ektf2132", .data = &ektf2127_data}, + { .compatible = "elan,ektf2232", .data = &ektf2232_data}, {} }; MODULE_DEVICE_TABLE(of, ektf2127_of_match); #endif static const struct i2c_device_id ektf2127_i2c_id[] = { - { "ektf2127", 0 }, - { "ektf2132", 0 }, + { .name = "ektf2127", .driver_data = (long)&ektf2127_data }, + { .name = "ektf2132", .driver_data = (long)&ektf2127_data }, + { .name = "ektf2232", .driver_data = (long)&ektf2232_data }, {} }; MODULE_DEVICE_TABLE(i2c, ektf2127_i2c_id);