arm64: dts: qcom: sc8280xp-x13s: enable alternate touchpad

Enable both touchpad nodes in the devictree and let the HID driver
determine which one is actually populated (by attempting to read from
each i2c address).

Ideally this would not be needed and the boot firmware should instead
enable only the node for the populated touchpad, but this is unlikely to
ever be realised for the X13s.

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 (e.g. to allow them to be
probed in parallel).

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230324094744.20448-1-johan+linaro@kernel.org

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 0d1e49d..19d5ac6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -603,7 +603,7 @@
        clock-frequency = <400000>;
 
        pinctrl-names = "default";
-       pinctrl-0 = <&i2c21_default>;
+       pinctrl-0 = <&i2c21_default>, <&tpad_default>;
 
        status = "okay";
 
@@ -616,12 +616,7 @@
                vdd-supply = <&vreg_misc_3p3>;
                vddl-supply = <&vreg_s10b>;
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&tpad_default>;
-
                wakeup-source;
-
-               status = "disabled";
        };
 
        touchpad@2c {
@@ -633,9 +628,6 @@
                vdd-supply = <&vreg_misc_3p3>;
                vddl-supply = <&vreg_s10b>;
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&tpad_default>;
-
                wakeup-source;
        };