From: Johan Hovold <johan+linaro@kernel.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 5/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config
Date: Fri, 5 Aug 2022 11:23:15 +0200 [thread overview]
Message-ID: <20220805092317.4985-6-johan+linaro@kernel.org> (raw)
In-Reply-To: <20220805092317.4985-1-johan+linaro@kernel.org>
The HID pin configurations belong in the HID nodes rather than i2c bus
node.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
.../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>;
};
};
--
2.35.1
next prev parent reply other threads:[~2022-08-05 9:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 9:23 [PATCH 0/7] arm64: dts: qcom: sc8280xp: HID wakeup sources and alt. touchpad Johan Hovold
2022-08-05 9:23 ` [PATCH 1/7] arm64: dts: qcom: sc8280xp-crd: disable touchscreen pull-up Johan Hovold
2022-08-06 16:54 ` Manivannan Sadhasivam
2022-08-05 9:23 ` [PATCH 2/7] arm64: dts: qcom: sc8280xp-crd: move HID pin config Johan Hovold
2022-08-06 16:56 ` Manivannan Sadhasivam
2022-08-05 9:23 ` [PATCH 3/7] arm64: dts: qcom: sc8280xp-crd: mark HID wakeup sources Johan Hovold
2022-08-06 16:57 ` Manivannan Sadhasivam
2022-08-05 9:23 ` [PATCH 4/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: disable touchscreen pull-up Johan Hovold
2022-08-06 16:57 ` Manivannan Sadhasivam
2022-08-05 9:23 ` Johan Hovold [this message]
2022-08-06 16:57 ` [PATCH 5/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config Manivannan Sadhasivam
2022-08-05 9:23 ` [PATCH 6/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: mark HID wakeup sources Johan Hovold
2022-08-06 16:58 ` Manivannan Sadhasivam
2022-08-05 9:23 ` [PATCH 7/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: add alternate touchpad Johan Hovold
2022-08-06 16:59 ` Manivannan Sadhasivam
2022-08-05 11:02 ` [PATCH 0/7] arm64: dts: qcom: sc8280xp: HID wakeup sources and alt. touchpad Konrad Dybcio
2022-08-05 12:17 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220805092317.4985-6-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@somainline.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).