aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2022-07-31 13:43:46 +0200
committerJohan Hovold <johan+linaro@kernel.org>2022-12-27 10:56:48 +0100
commit55fd7b2423a153a067377c1608b3a4b0ae5ccc89 (patch)
tree001800abc7c76539f420e47c0e3859d6d0390b7d
parenta437a9ee5fb88c473937d9aa0cc83734aa0f44b5 (diff)
hack: arm64: dts: qcom: sc8280xp-x13s: enable both touchpads
Enable both touchpad nodes in the devictree and let the HID driver determine which one is actually populated. Note that the pin configuration must currently be moved to the parent i2c-bus node even though only one of these nodes will ever be successfully probed on a specific device. This is needed until the boot firmware can enable only the node for the populated touchpad. Not-signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-rw-r--r--arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts10
1 files changed, 1 insertions, 9 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 d2da0b5a80803..3399396c1000b 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -732,7 +732,7 @@
clock-frequency = <400000>;
pinctrl-names = "default";
- pinctrl-0 = <&qup2_i2c5_default>;
+ pinctrl-0 = <&qup2_i2c5_default>, <&tpad_default>;
status = "okay";
@@ -744,12 +744,7 @@
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 {
@@ -760,9 +755,6 @@
interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- pinctrl-names = "default";
- pinctrl-0 = <&tpad_default>;
-
wakeup-source;
};