arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config

The HID pin configurations belong in the HID nodes rather than i2c bus
node.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220805092317.4985-6-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 fbe874ba4fe168cf799c9523576659b7d85251f4..59869e76647696c49719a3307ca9e4fcd2106975 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -187,7 +187,7 @@
        clock-frequency = <400000>;
 
        pinctrl-names = "default";
-       pinctrl-0 = <&qup0_i2c4_default>, <&ts0_default>;
+       pinctrl-0 = <&qup0_i2c4_default>;
 
        status = "okay";
 
@@ -195,9 +195,13 @@
        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>;
        };
 };
 
@@ -213,24 +217,32 @@
        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>;
        };
 };