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>2023-02-21 16:54:01 +0100
commitcaafb36c12a53346f0651e3882710def1b2eebe7 (patch)
tree7a699d5523c9b38ed4f1e1a410d3e313c6d7ed69
parentdc0693ea0542a6127bda5b3d2f0edc2ddb3bc981 (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 ff1327e8277b..198a81405e6e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -864,7 +864,7 @@
clock-frequency = <400000>;
pinctrl-names = "default";
- pinctrl-0 = <&qup2_i2c5_default>;
+ pinctrl-0 = <&qup2_i2c5_default>, <&tpad_default>;
status = "okay";
@@ -876,12 +876,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 {
@@ -892,9 +887,6 @@
interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- pinctrl-names = "default";
- pinctrl-0 = <&tpad_default>;
-
wakeup-source;
};