From patchwork Sat Dec 23 22:12:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13504154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 863F6C3DA6E for ; Sat, 23 Dec 2023 22:13:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zHXo6W/h5q7Em42HSgvSqoEz+Dcgy0z9wzyn1bkcCNA=; b=ujrQ5xiqyEBALS 3QIOKXHqZixMl0hg0VKAGETc3+AuGXNGHAci0ZGJmir8Dx2erEHbtxiYrow5mYNqzhBVu653mV4Ti oMdhV8x3eXmRd4okIkz+C1cKmOcd21vDoPlPm/BP/szLBCvH+PTTvIg69r7Nd2Ap5UNNQiuTMmiL5 M8csZxsIEHSpAW1cBb1qacq1FO55Nd/hIY7/yGyqy6psP3DySFurIRLuyWAhAXcknfQOt9bUxEVzr BXMa5hBucLpl64IB97lpmy7QHNiHk/Jxsaw6KH9k1NyGogKMcffchTFWaL3VHBXizY8vTCiEl4/DJ Nc5mRlfIy9zbqEuPXxyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEv-008XHL-2o; Sat, 23 Dec 2023 22:13:01 +0000 Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEe-008X9a-0g for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 22:12:46 +0000 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:Cc:To:From:Sender:Reply-To: 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=fbKwDDXwndQhx6klD6d+ZZNbZaa2yIeQizw0w4XCPfY=; b=W1MHS6GBmasrz2GYyrkZ3QaMbm R4+LVb5eRKkk3Ty9VZqcMrH1UZ4iNtndrqDdLPNAvKfZuW+f98V5cTGrMs0RrmR3sjGda3X1veeby 726vTC75sV8XTqs/d6sv6jTuLzmKD1S2J5nvlM5n0QuW7jQMRVRpxnOVOU+oJp6DoYFvQaZxKmikY xoXfLgmDU3SbKiDLgaJLx4qfauZrTkgKmRWg26J1CXQOF7UxhlwZdO+cwJEZxo3R21YscgdAfkfYG oj/0fBVnx954sptbQ6DtDgA+zz2mUCmk7ATUKNpCYlup9ukBSoGadJz8FLI1xRz/4OPXUzTQgxAFU 01SNZ8rg==; Received: from p200301077700c3001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:107:7700:c300: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.94.2) (envelope-from ) id 1rHAEJ-007f7Y-Kf; Sat, 23 Dec 2023 23:12:23 +0100 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1rHAEI-003Fa7-3D; Sat, 23 Dec 2023 23:12:23 +0100 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, rydberg@bitmath.org, andreas@kemnade.info, linus.walleij@linaro.org, Jonathan.Cameron@huawei.com, u.kleine-koenig@pengutronix.de, heiko@sntech.de, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 1/4] dt-bindings: touchscreen: convert neonode,zforce to json-schema Date: Sat, 23 Dec 2023 23:12:10 +0100 Message-Id: <20231223221213.774868-2-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231223221213.774868-1-andreas@kemnade.info> References: <20231223221213.774868-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_141244_247421_938E8FEB X-CRM114-Status: GOOD ( 13.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert Neonode infrared touchscreen controller binding to DT schema. Signed-off-by: Andreas Kemnade Reviewed-by: Krzysztof Kozlowski --- .../input/touchscreen/neonode,zforce.yaml | 67 +++++++++++++++++++ .../bindings/input/touchscreen/zforce_ts.txt | 34 ---------- 2 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt diff --git a/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml b/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml new file mode 100644 index 0000000000000..c39662815a6c5 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml @@ -0,0 +1,67 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen/neonode,zforce.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Neonode infrared touchscreen controller + +maintainers: + - Heiko Stuebner + +properties: + compatible: + const: neonode,zforce + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + reset-gpios: + maxItems: 1 + + irq-gpios: + maxItems: 1 + + x-size: + $ref: /schemas/types.yaml#/definitions/uint32 + + y-size: + $ref: /schemas/types.yaml#/definitions/uint32 + + vdd-supply: true + +required: + - compatible + - reg + - interrupts + - reset-gpios + - x-size + - y-size + +unevaluatedProperties: false + +examples: + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + touchscreen@50 { + compatible = "neonode,zforce"; + reg = <0x50>; + interrupts = <2 0>; + vdd-supply = <®_zforce_vdd>; + + reset-gpios = <&gpio5 9 0>; /* RST */ + irq-gpios = <&gpio5 6 0>; /* IRQ, optional */ + + x-size = <800>; + y-size = <600>; + }; + }; +... diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt deleted file mode 100644 index e3c27c4fd9c85..0000000000000 --- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt +++ /dev/null @@ -1,34 +0,0 @@ -* Neonode infrared touchscreen controller - -Required properties: -- compatible: must be "neonode,zforce" -- reg: I2C address of the chip -- interrupts: interrupt to which the chip is connected -- reset-gpios: reset gpio the chip is connected to -- x-size: horizontal resolution of touchscreen -- y-size: vertical resolution of touchscreen - -Optional properties: -- irq-gpios : interrupt gpio the chip is connected to -- vdd-supply: Regulator controlling the controller supply - -Example: - - i2c@00000000 { - /* ... */ - - zforce_ts@50 { - compatible = "neonode,zforce"; - reg = <0x50>; - interrupts = <2 0>; - vdd-supply = <®_zforce_vdd>; - - reset-gpios = <&gpio5 9 0>; /* RST */ - irq-gpios = <&gpio5 6 0>; /* IRQ, optional */ - - x-size = <800>; - y-size = <600>; - }; - - /* ... */ - }; From patchwork Sat Dec 23 22:12:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13504150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC013C3DA6E for ; Sat, 23 Dec 2023 22:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eBbPha6MmS+UCFT6g16pQJARtRYE58gXRKHQWfXNhY8=; b=ZprpXOvnywWDaf Y6CYmRykzU4ExSacL3WVLPINuSmAkEaPh4DKnR0gyhTbwWzDmFMajtGXdPRYLD2lgGCVN+bVTgUqz C8iFyFGXkoTQ6PAg2/9iTlr0gYKS2pKQLKTWEInPTWVDR8cVL+v6pmytz3xkAxeUdMGLdTSRUuvfS rcaoKSqHlrKqSljfbBep4rJivGXw7uT5eKKDfTohCbYBF+l162QNXFPYZEAwZRhJRuNGCR0PwfQVD Jsu0E+JmXx1TRsb4/6VNnRnrELUJqZetuMvtkX8eRzA/gUrHgMpj2PMGkmzpDUji6eC6d5rXETth3 fnBF4mys8fpOtqEtqH5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEh-008XB7-0A; Sat, 23 Dec 2023 22:12:47 +0000 Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEd-008X93-2U for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 22:12:45 +0000 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:Cc:To:From:Sender:Reply-To: 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=wNnMpPSuWfDBc3iHywduR+Ih2mlWoXSvgD9/nDYl3K0=; b=bDwJYrI4eAUzGR4S7S/zojT8+7 64BMJ+nQq+hoz4+tr5lmrmMEfP4k7idGp2zCzLMJ4kegGKmw4cLxMZW97SOwO82gCCkrm90oKIdBy VpGRCSqHtlnKqyERFHnrBt3rjl9MPXhyBV8ZQCBBlOfvv57Thdth1CXN8KrVTDau9c8AUxHuIVJKp eQm08vbj7mIxSCz59yDW0ojGk37SzHiUdWy2S6IPqX4Hu2jzT4Lxh9DCLvTL9dhrqLH/Idn7ElrTV k69Bc+R7MKj4UHCOhYrhW6/94RDMgo2eQ9to3yEi8iSxc6jDXRyVuVqOfjfbdDZtYAQgZsGsQbx1j iEOh+yGg==; Received: from p200301077700c3001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:107:7700:c300: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.94.2) (envelope-from ) id 1rHAEK-007f7a-4q; Sat, 23 Dec 2023 23:12:24 +0100 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1rHAEJ-003FaC-20; Sat, 23 Dec 2023 23:12:23 +0100 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, rydberg@bitmath.org, andreas@kemnade.info, linus.walleij@linaro.org, Jonathan.Cameron@huawei.com, u.kleine-koenig@pengutronix.de, heiko@sntech.de, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Rob Herring Subject: [PATCH v3 2/4] dt-bindings: touchscreen: neonode,zforce: Use standard properties Date: Sat, 23 Dec 2023 23:12:11 +0100 Message-Id: <20231223221213.774868-3-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231223221213.774868-1-andreas@kemnade.info> References: <20231223221213.774868-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_141243_839195_A751FAAD X-CRM114-Status: UNSURE ( 9.15 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable touchscreen orientation to be specified by using standard properties. Signed-off-by: Andreas Kemnade Reviewed-by: Rob Herring --- .../bindings/input/touchscreen/neonode,zforce.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml b/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml index c39662815a6c5..c2ee89b76ea13 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml @@ -9,6 +9,9 @@ title: Neonode infrared touchscreen controller maintainers: - Heiko Stuebner +allOf: + - $ref: touchscreen.yaml# + properties: compatible: const: neonode,zforce @@ -26,9 +29,11 @@ properties: maxItems: 1 x-size: + deprecated: true $ref: /schemas/types.yaml#/definitions/uint32 y-size: + deprecated: true $ref: /schemas/types.yaml#/definitions/uint32 vdd-supply: true @@ -38,8 +43,6 @@ required: - reg - interrupts - reset-gpios - - x-size - - y-size unevaluatedProperties: false @@ -60,8 +63,10 @@ examples: reset-gpios = <&gpio5 9 0>; /* RST */ irq-gpios = <&gpio5 6 0>; /* IRQ, optional */ - x-size = <800>; - y-size = <600>; + touchscreen-min-x = <0>; + touchscreen-size-x = <800>; + touchscreen-min-y = <0>; + touchscreen-size-y = <600>; }; }; ... From patchwork Sat Dec 23 22:12:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13504153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4C0EC46CD3 for ; Sat, 23 Dec 2023 22:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9NkihdpmzdJ37kiHrmhSdNoywul3qV9ghguakOW45ck=; b=eLiamSlKVKMXEI iTpwZzncLOfSdsb/ui2SBzzBsy+xGuuw1ZcUEFwm4UHYdUXdEx0CHnR/Cxvc/sxIJzrMbVEmZS1f2 LcO/SIZDWAfXQD4AT4x/NL2sV5koOC+1WdZutIREdSc/Q2EIOAJKk5k0hC7geOd/XiMcEDlctYFWJ /SwgWJZWqX5Dqy3E5PYLn/ffqLghKH3D7h56XwpVREqe4Bgud85vJxJjDA0boyRGm4cmX0G6pxCXM dlQ+xFtuyj2OQ0rzMDRfK4rqA2xlTR6jiSdPlHylvjGiE+aAAypR9vFfGaa3aBhdeMVDixd4JRA7E Q7OxwuOvDpCLInAPvepw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEh-008XBF-1o; Sat, 23 Dec 2023 22:12:47 +0000 Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEd-008X9Z-2Z for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 22:12:45 +0000 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=NpY3EimOAO7fdKupobvAOCqbFhsZ6eizQExlx9KlQYE=; b=rq/Wl09BjslAj82DLo/FVvQuft mRUWIegLkCGz44P8oMlovQ/F3f3IEcn75Qy6NJt+AIRbt5Lcr3tD0ZLRymlgY6xCYFdb3jOoNS6Tw DjgaXKWW4E9Ip4rntf8lFStcPkil+Svsw47G1Xqn0YIXWGCcv8MR2e5xIObvpYo/2/LFquZYOSNOe asMNVHj7M5OBVUGI63K0nwgufPn92MW+j+mBUxZkmA5FIr4ert/qF/6Qp+HFDirM/gwK6jNYrFOYD xLcUtfhYitO795tnJH92CPSWt2cMqvreTsgCKsw7cE26AokolCZ8kv5clNnq0PTPIvFCKb1IZD5Ok kTmSb1SQ==; Received: from p200301077700c3001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:107:7700:c300: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.94.2) (envelope-from ) id 1rHAEK-007f7c-OD; Sat, 23 Dec 2023 23:12:24 +0100 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1rHAEK-003FaH-0i; Sat, 23 Dec 2023 23:12:24 +0100 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, rydberg@bitmath.org, andreas@kemnade.info, linus.walleij@linaro.org, Jonathan.Cameron@huawei.com, u.kleine-koenig@pengutronix.de, heiko@sntech.de, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/4] Input: zforce_ts: Accept standard touchscreen properties Date: Sat, 23 Dec 2023 23:12:12 +0100 Message-Id: <20231223221213.774868-4-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231223221213.774868-1-andreas@kemnade.info> References: <20231223221213.774868-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_141243_839325_83C08939 X-CRM114-Status: GOOD ( 15.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Only driver-specific properties were accepted, change it to use the now-available standard properties. Signed-off-by: Andreas Kemnade --- drivers/input/touchscreen/zforce_ts.c | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c index 5be5112845e1e..f4397497bbe94 100644 --- a/drivers/input/touchscreen/zforce_ts.c +++ b/drivers/input/touchscreen/zforce_ts.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -106,6 +107,7 @@ struct zforce_point { struct zforce_ts { struct i2c_client *client; struct input_dev *input; + struct touchscreen_properties prop; const struct zforce_ts_platdata *pdata; char phys[32]; @@ -266,7 +268,6 @@ static int zforce_setconfig(struct zforce_ts *ts, char b1) static int zforce_start(struct zforce_ts *ts) { struct i2c_client *client = ts->client; - const struct zforce_ts_platdata *pdata = ts->pdata; int ret; dev_dbg(&client->dev, "starting device\n"); @@ -277,7 +278,7 @@ static int zforce_start(struct zforce_ts *ts) return ret; } - ret = zforce_resolution(ts, pdata->x_max, pdata->y_max); + ret = zforce_resolution(ts, ts->prop.max_x, ts->prop.max_y); if (ret) { dev_err(&client->dev, "Unable to set resolution, %d\n", ret); goto error; @@ -337,7 +338,6 @@ static int zforce_stop(struct zforce_ts *ts) static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) { struct i2c_client *client = ts->client; - const struct zforce_ts_platdata *pdata = ts->pdata; struct zforce_point point; int count, i, num = 0; @@ -355,8 +355,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) point.coord_y = payload[9 * i + 4] << 8 | payload[9 * i + 3]; - if (point.coord_x > pdata->x_max || - point.coord_y > pdata->y_max) { + if (point.coord_x > ts->prop.max_x || + point.coord_y > ts->prop.max_y) { dev_warn(&client->dev, "coordinates (%d,%d) invalid\n", point.coord_x, point.coord_y); point.coord_x = point.coord_y = 0; @@ -390,10 +390,11 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) point.state != STATE_UP); if (point.state != STATE_UP) { - input_report_abs(ts->input, ABS_MT_POSITION_X, - point.coord_x); - input_report_abs(ts->input, ABS_MT_POSITION_Y, - point.coord_y); + touchscreen_report_pos(ts->input, + &ts->prop, + point.coord_x, + point.coord_y, + true); input_report_abs(ts->input, ABS_MT_TOUCH_MAJOR, point.area_major); input_report_abs(ts->input, ABS_MT_TOUCH_MINOR, @@ -719,15 +720,8 @@ static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev) return ERR_PTR(-ENOMEM); } - if (of_property_read_u32(np, "x-size", &pdata->x_max)) { - dev_err(dev, "failed to get x-size property\n"); - return ERR_PTR(-EINVAL); - } - - if (of_property_read_u32(np, "y-size", &pdata->y_max)) { - dev_err(dev, "failed to get y-size property\n"); - return ERR_PTR(-EINVAL); - } + of_property_read_u32(np, "x-size", &pdata->x_max); + of_property_read_u32(np, "y-size", &pdata->y_max); return pdata; } @@ -856,6 +850,12 @@ static int zforce_probe(struct i2c_client *client) input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, pdata->y_max, 0, 0); + touchscreen_parse_properties(input_dev, true, &ts->prop); + if (ts->prop.max_x == 0 || ts->prop.max_y == 0) { + dev_err(&client->dev, "no size specified\n"); + return -EINVAL; + } + input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, ZFORCE_MAX_AREA, 0, 0); input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR, 0, From patchwork Sat Dec 23 22:12:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Kemnade X-Patchwork-Id: 13504151 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8CD58C3DA6E for ; Sat, 23 Dec 2023 22:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tr2URZBNxJHUFS7QzdsBZzdMim5HXASziIdI0Lf60LY=; b=GSezigxiihGFrS +JDwhaPQvdVyIFU/I53y/SqsOjNrEf3l/czZC8V0opk2x6DcuMy3rHattzeHfHIk9Cb/yzLu6eWGF 7tjl01nIJUKG+RKZPVQpsiUjeoHbCAdypSIuMV7rlH1fq6ejJPzI0poYEwPVc6Fo+Tvg9T5VYKUbA qIi9JAcRosYfU+kY7w3+0dK/adSmijydFaUyCbpJeYUTpADAMB5rWlsKC6INgzwR5bgXd/Vjuivdw l5Ua8aCAbdMeRdwDzTsSzerrqfTPcYUFZGnqeSIibui2cnuY3HeL9ncu64fdkYyz8rUrBpDmAxAUS /NBTVQDqw4En5ZeKvPmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEu-008XFo-1s; Sat, 23 Dec 2023 22:13:00 +0000 Received: from mail.andi.de1.cc ([2a02:c205:3004:2154::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHAEe-008X9b-1J for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 22:12:46 +0000 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=b1HMz+ohMNl8A5LPDegcPK2gw7uCgp/vFwsqaqz/imM=; b=9VLlq4HGCfbmZy4/v3pcoPm62r 3S/m3nXnPC7Rnd9mF2GaAKPmFZS9SXBa4FDrLzxwoWKibvw+BEkYdvjqrwZAk3IyhsXbRpcqgULWg xnnvZzGQlUDEZ9ByXJa3Hk9/LHabwdJGzEhFJYGFXXctzQ3Y0rQrAtnHYMAZQcDaviz814EGIb49C NYOYCuGxOG6QfmYcxzqIXfQPf4a3Lnm7s4yfJ/KGeBd14L558JkdX4O/vz6161ML4zuNdp7Mzg8dr 2DOxgVk01ZSb66MHawHK3SJlsHttSbEqucaxnmvbz/JTo071Swd001FIt7uzFUufYuEkNhARVdG3l hS2JwNBw==; Received: from p200301077700c3001a3da2fffebfd33a.dip0.t-ipconnect.de ([2003:107:7700:c300: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.94.2) (envelope-from ) id 1rHAEL-007f7e-CM; Sat, 23 Dec 2023 23:12:25 +0100 Received: from andi by aktux with local (Exim 4.96) (envelope-from ) id 1rHAEK-003FaM-2N; Sat, 23 Dec 2023 23:12:24 +0100 From: Andreas Kemnade To: dmitry.torokhov@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, rydberg@bitmath.org, andreas@kemnade.info, linus.walleij@linaro.org, Jonathan.Cameron@huawei.com, u.kleine-koenig@pengutronix.de, heiko@sntech.de, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/4] ARM: dts: imx6sl-tolino-shine2hd: fix touchscreen rotation Date: Sat, 23 Dec 2023 23:12:13 +0100 Message-Id: <20231223221213.774868-5-andreas@kemnade.info> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231223221213.774868-1-andreas@kemnade.info> References: <20231223221213.774868-1-andreas@kemnade.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_141244_439298_3E6E7F34 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The display is in landscape orientation, but the touchscreen is in portrait orientation. Specify that properly in the devicetree. Signed-off-by: Andreas Kemnade --- arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts b/arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts index 815119c12bd48..5636fb3661e8a 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts @@ -141,8 +141,10 @@ zforce: touchscreen@50 { interrupts = <6 IRQ_TYPE_EDGE_FALLING>; vdd-supply = <&ldo1_reg>; reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; - x-size = <1072>; - y-size = <1448>; + touchscreen-size-x = <1072>; + touchscreen-size-y = <1448>; + touchscreen-swapped-x-y; + touchscreen-inverted-x; }; /* TODO: TPS65185 PMIC for E Ink at 0x68 */