From patchwork Fri Aug 5 09:23:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595565 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEC7BC25B0D for ; Fri, 5 Aug 2022 09:23:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240471AbiHEJXY (ORCPT ); Fri, 5 Aug 2022 05:23:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237079AbiHEJXW (ORCPT ); Fri, 5 Aug 2022 05:23:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D2627820A; Fri, 5 Aug 2022 02:23:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CFD8AB82843; Fri, 5 Aug 2022 09:23:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B4F1C43470; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=qPl/K0vBXiVR0oW+/zJbjc2Gr5jHJqHmSUyyPbLGSpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DXIvLCw7kC2AcUvYCr36kXwRB7AYpvQ1org1ILY1Y51T5kh87Qjoou83CU7SPpa3i 2pQ0CaOqgcIb28FV/YVu76C5t8YsdPV1iR0UztCXARaw4C4E0IpSahOnntkPQyf+1X 1PAOsEZv+DOF8zLVNHBqB8s0yV9Oyru2FS/eunQ5RNVvvGkmg+2t86bPwcB+VKjU95 k9Kw8phvdu2A/6VkZ12An64biud6jjIH16QGtEmkP+SkRvFXK5YhIwlFGmloTfTa6q 929a8ldI3rCISwb+Cp1cMYxunonAQ975PZb01mtREAgK+VPGWOZxrgVgVirQf6Ofqf R8m5Cz263j/dQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYV-0001JB-MP; Fri, 05 Aug 2022 11:23:43 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 1/7] arm64: dts: qcom: sc8280xp-crd: disable touchscreen pull-up Date: Fri, 5 Aug 2022 11:23:11 +0200 Message-Id: <20220805092317.4985-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The touchscreen interrupt line has an external pull-up so disable the internal one as is done for the keyboard and touchpad. Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 6792e88b2c6c..47192e9cf7a4 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -405,7 +405,7 @@ ts0_default: ts0-default-state { int-n { pins = "gpio175"; function = "gpio"; - bias-pull-up; + bias-disable; }; reset-n { From patchwork Fri Aug 5 09:23:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595834 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91165C25B08 for ; Fri, 5 Aug 2022 09:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240482AbiHEJXZ (ORCPT ); Fri, 5 Aug 2022 05:23:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235591AbiHEJXW (ORCPT ); Fri, 5 Aug 2022 05:23:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06AF978209; Fri, 5 Aug 2022 02:23:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B9F75B82844; Fri, 5 Aug 2022 09:23:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E666C433B5; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=DpARAXXarzdQ4KGx9KSj09JvLrXb5B+bMCaD9TXDhJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bp45lNAzAOs2DtycJYkTFkb5IemWQfaIpt2tgFJ2f780xgY3Hf/zDCbVa2WDyUJD4 lCda3OSOX36VEn2FP1dtRhTfIRGPmpgu9OaZYTiC4b06r2Fh8QOgYt2fifOZPMHF3j Ze1NmAKcv8GR/KJig525gcK2Ix1CmUyfvFrxh0N3zSBjlz4GijPIgYAR+nNJvFrsJJ tRl4Hln3IoV4VZWGyceow22u+llRchff4ULk9r5HkgFz7PdRUXCtTBlu1xZa+QBlVc w0fZTKasvXQZG16ZHjtzta98IUQSpAEvLPCW83CrBo7GthIEmYmdJHUII8S5QH0XCc 7Mtqnsu5gs4gQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYV-0001JD-Pe; Fri, 05 Aug 2022 11:23:43 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/7] arm64: dts: qcom: sc8280xp-crd: move HID pin config Date: Fri, 5 Aug 2022 11:23:12 +0200 Message-Id: <20220805092317.4985-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The HID pin configurations belong in the HID nodes rather than i2c bus node. Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 47192e9cf7a4..ae8be1b743ce 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -194,16 +194,20 @@ &qup0_i2c4 { clock-frequency = <400000>; pinctrl-names = "default"; - pinctrl-0 = <&qup0_i2c4_default>, <&ts0_default>; + pinctrl-0 = <&qup0_i2c4_default>; status = "okay"; touchscreen@10 { compatible = "hid-over-i2c"; reg = <0x10>; + hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&ts0_default>; }; }; @@ -219,24 +223,32 @@ &qup2_i2c5 { clock-frequency = <400000>; pinctrl-names = "default"; - pinctrl-0 = <&qup2_i2c5_default>, <&kybd_default>, <&tpad_default>; + pinctrl-0 = <&qup2_i2c5_default>; status = "okay"; touchpad@15 { compatible = "hid-over-i2c"; reg = <0x15>; + hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&tpad_default>; }; keyboard@68 { compatible = "hid-over-i2c"; reg = <0x68>; + hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&kybd_default>; }; }; From patchwork Fri Aug 5 09:23:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595566 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79597C3F6B0 for ; Fri, 5 Aug 2022 09:23:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237056AbiHEJXW (ORCPT ); Fri, 5 Aug 2022 05:23:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234956AbiHEJXV (ORCPT ); Fri, 5 Aug 2022 05:23:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6E8C78206; Fri, 5 Aug 2022 02:23:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3C1586183D; Fri, 5 Aug 2022 09:23:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85147C433D6; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=S0yVGCrgMNr6x3Uzjjk6JhHX4OwT+7UD4sUKQW7juXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oz9LQ+Zm8O+HgDOF6DVqEjUJ4pcgrytcRhCml+yyf1MI3lROLbtp2YYwrGqA7a55w m1wEa5gxzyB65Syy5OR61mxd36kbK+krDPQygwGn+ocqDZQrT0dZA/FdNgpfjZlo2b 9VYOnENYLi3swx+xp3Kfm2evoSBHOeyIECi+XlJvaI7HN3mkUBD6yxKG4rJAik5L2Z pLdepsVTCUPlFpOyMESVldkKfOeCLZXDGnRoJhVvDtFsXczA1bk9yCxItmdLEugC2d 0t+5uqsoFIazfTuiRpOWpPDhpPZ+g8ce87MnVMPj1x4Q4zGJIemUyEALBiTmD5NtV5 flxnHdtjkw1BA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYV-0001JF-Ss; Fri, 05 Aug 2022 11:23:43 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/7] arm64: dts: qcom: sc8280xp-crd: mark HID wakeup sources Date: Fri, 5 Aug 2022 11:23:13 +0200 Message-Id: <20220805092317.4985-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The touchpad and keyboard can wake the system from suspend so declare them as wakeup sources. Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index ae8be1b743ce..fea7d8273ccd 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -237,6 +237,8 @@ touchpad@15 { pinctrl-names = "default"; pinctrl-0 = <&tpad_default>; + + wakeup-source; }; keyboard@68 { @@ -249,6 +251,8 @@ keyboard@68 { pinctrl-names = "default"; pinctrl-0 = <&kybd_default>; + + wakeup-source; }; }; From patchwork Fri Aug 5 09:23:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595564 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBD2AC00140 for ; Fri, 5 Aug 2022 09:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237188AbiHEJXZ (ORCPT ); Fri, 5 Aug 2022 05:23:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237869AbiHEJXX (ORCPT ); Fri, 5 Aug 2022 05:23:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 558B778203; Fri, 5 Aug 2022 02:23:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 05E4CB8285A; Fri, 5 Aug 2022 09:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99349C43145; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=xfjyRRCXzzCzBzpor87xc8JJpDRO1zj71SbBmtHDyb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=miKvhm3Ie669U/JDPfQlzw9s7YQ72rTd9mtTmx0ubWW4i1hyTgsf0iyZ7TyaaqmA7 nxn4DtmEcBjsVnzfYLELntOeR+T8oYRRAc+dw7yeYTYuyAITKO1of+ips4BwHtY6s2 OWvoo4O15TX+ki+4FzOrf3G1Loe0wsY5RrXE86g8JB1kEO+nIIAJIqxH/jMEPf2j7J sx/xycFYxY6VwfNYIzXHg2bZGG/57p4hPP11Jd2V8xrjxiRR+mnWV6+p7561lCBEhu WAdxBVf0bOkgGYByChxezrHkjWwrZ7tosTVj11Y2k4/gU5KlZpZfZ+Y+v6TEBD97/x DzzWJLFf+XnRQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYV-0001JI-W9; Fri, 05 Aug 2022 11:23:44 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 4/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: disable touchscreen pull-up Date: Fri, 5 Aug 2022 11:23:14 +0200 Message-Id: <20220805092317.4985-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The (optional) touchscreen interrupt line has an external pull-up so disable the internal one as is done for the keyboard and touchpad. Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 562b4458e039..85efce641a4e 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -363,7 +363,7 @@ ts0_default: ts0-default-state { int-n { pins = "gpio175"; function = "gpio"; - bias-pull-up; + bias-disable; }; reset-n { From patchwork Fri Aug 5 09:23:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595832 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A125BC25B08 for ; Fri, 5 Aug 2022 09:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240291AbiHEJXa (ORCPT ); Fri, 5 Aug 2022 05:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240369AbiHEJX0 (ORCPT ); Fri, 5 Aug 2022 05:23:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05B3978206; Fri, 5 Aug 2022 02:23:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4EC9EB827EA; Fri, 5 Aug 2022 09:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3AF3C4314A; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=XVTrUBrv0fIUcd2JC3KYyO5kRWwJUrH30DUHjZKyJ2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Het0nAq/GqKS7BGad66e2VmsCXXtEUlgtjUDm6WviBSwD9AT0JfXb0m7mm4k1UpFN d92VSQ70ueI5PJbyfYVMveHL7FRoWNoIcBHpRAFBsE1nHfSGHZjJdxo/L/qj22J35m WyoOTQbpG5EDyOYyiQX88lUnrXbYnQBWF3pcZ1hDfehoYzTXVSb45SfC8JIS9F5UJz Q8jEr/AHoAAOTWpentMWperevQtUs3iZQdLuWSDy6Vqx/U5jEjob52Ims5pudZWWAC y56Mm170F7pE1kq7qZ4Gn6K73S+3YsRTmcLtuVWVaMC9NFNPEN+606wQKcbMjB5tPD gu1dOl340T0gA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYW-0001JL-2m; Fri, 05 Aug 2022 11:23:44 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 5/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config Date: Fri, 5 Aug 2022 11:23:15 +0200 Message-Id: <20220805092317.4985-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The HID pin configurations belong in the HID nodes rather than i2c bus node. Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 85efce641a4e..76ba2d5fa17e 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -177,7 +177,7 @@ &qup0_i2c4 { clock-frequency = <400000>; pinctrl-names = "default"; - pinctrl-0 = <&qup0_i2c4_default>, <&ts0_default>; + pinctrl-0 = <&qup0_i2c4_default>; status = "okay"; @@ -185,9 +185,13 @@ &qup0_i2c4 { touchscreen@10 { compatible = "hid-over-i2c"; reg = <0x10>; + hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&ts0_default>; }; }; @@ -203,24 +207,32 @@ &qup2_i2c5 { clock-frequency = <400000>; pinctrl-names = "default"; - pinctrl-0 = <&qup2_i2c5_default>, <&kybd_default>, <&tpad_default>; + pinctrl-0 = <&qup2_i2c5_default>; status = "okay"; touchpad@2c { compatible = "hid-over-i2c"; reg = <0x2c>; + hid-descr-addr = <0x20>; interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&tpad_default>; }; keyboard@68 { compatible = "hid-over-i2c"; reg = <0x68>; + hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>; vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&kybd_default>; }; }; From patchwork Fri Aug 5 09:23:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595833 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F16A5C25B07 for ; Fri, 5 Aug 2022 09:23:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240483AbiHEJX0 (ORCPT ); Fri, 5 Aug 2022 05:23:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240264AbiHEJXX (ORCPT ); Fri, 5 Aug 2022 05:23:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB61478201; Fri, 5 Aug 2022 02:23:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 647FDB8285C; Fri, 5 Aug 2022 09:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4F4DC43151; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691399; bh=2z6kLjTnIFxpkN2jRIF3jLC49t4msD6VHl4Ik60e4Cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiwZGeBodikZ+pDjD6x3/vpKAGqQpO3nNSyYsBsl1lP9Y4d2VEgpFqO2zKSY++rrq BVCCO0YNXxsFJzhiQbFXLGnRUb/l6frLCOz5UHczuTKw5YrNWYdq/gk3QTDHQqHKNZ 9+NFpamLH3l1xgjVbpje1u0L92z+Xq+hP1l8H3iuc2aUxJqaMeOa+88fXz5lhyQmjB BJHBoi/makEBChT2DoC+oVFAzmNxfKhN7KRhlBw7szKV2uzpEXLdSL1BT4OUpHfgsr ptdt7fho4OkSY/g7qQ/sn6JkED4crBim0IU4x3R4OHOiowHPyWa1rO17pV8EFItywn 5byZ7QAJj/njw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYW-0001JO-61; Fri, 05 Aug 2022 11:23:44 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 6/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: mark HID wakeup sources Date: Fri, 5 Aug 2022 11:23:16 +0200 Message-Id: <20220805092317.4985-7-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The touchpad and keyboard can wake the system from suspend so declare them as wakeup sources. Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 76ba2d5fa17e..1ca72f6ba55a 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -221,6 +221,8 @@ touchpad@2c { pinctrl-names = "default"; pinctrl-0 = <&tpad_default>; + + wakeup-source; }; keyboard@68 { @@ -233,6 +235,8 @@ keyboard@68 { pinctrl-names = "default"; pinctrl-0 = <&kybd_default>; + + wakeup-source; }; }; From patchwork Fri Aug 5 09:23:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 595563 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7546CC25B0D for ; Fri, 5 Aug 2022 09:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231347AbiHEJX1 (ORCPT ); Fri, 5 Aug 2022 05:23:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240459AbiHEJXY (ORCPT ); Fri, 5 Aug 2022 05:23:24 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A866E78206; Fri, 5 Aug 2022 02:23:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id E1B3DCE299E; Fri, 5 Aug 2022 09:23:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCBCDC43152; Fri, 5 Aug 2022 09:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659691400; bh=+jrbsnZp5g5cBhtVRPraJopq2jNO8OVSWOuAvexfeLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s/ouyJvqUbiHSXDG0HOoHHd3m1yvVPWYPGk+sT2dmNu9lK17XcWI7rHwz0nFNDxMZ NkTTOzOL+jHZX0U7hPtWVU465wj1KtRNpE+qYJzibGAZoLTkTOFL0mQHQ1NPjrD0+x CQ75aT+yXo95tWi/F3ZeEXhb2YFF7fnyDSIiS+LY6oJtEXAO+y7KrI9aNoxg01p8xb E+3pJx2/CTDkFRmarU3Kcxp6oT/+ipYYkrfHxI0SudAHPweFvQR1WYyYwHz5cFw+/d 9AtOm5yPYc6zVP5UprYwUA+Yj81JtQAyxB/HXxctDKD5J6+L0FhL8a7Gcs9UnXKZMk tOSivNbh+yyBA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oJtYW-0001JR-9G; Fri, 05 Aug 2022 11:23:44 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 7/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: add alternate touchpad Date: Fri, 5 Aug 2022 11:23:17 +0200 Message-Id: <20220805092317.4985-8-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org> References: <20220805092317.4985-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for the alternate (second-source) touchpad found on some X13s laptops. Note that alternate touchpad is kept disabled for now. The boot firmware should determine which device is actually populated and enable only the corresponding node. Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 1ca72f6ba55a..bdeb2d05aaa1 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -211,6 +211,22 @@ &qup2_i2c5 { status = "okay"; + touchpad@15 { + compatible = "hid-over-i2c"; + reg = <0x15>; + + hid-descr-addr = <0x1>; + interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>; + vdd-supply = <&vreg_misc_3p3>; + + pinctrl-names = "default"; + pinctrl-0 = <&tpad_default>; + + wakeup-source; + + status = "disabled"; + }; + touchpad@2c { compatible = "hid-over-i2c"; reg = <0x2c>;