arm64: dts: qcom: sc8180x-lenovo-flex-5g: move pinctrl to appropriate nodes

Split keyboard and touchpad pinctrl nodes since they are for different
devices and move keyboard, touchpad and touchscreen pinctrl references to
appropriate nodes.

Signed-off-by: Anton Bambura <jenneron@postmarketos.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240203191200.99185-4-jenneron@postmarketos.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index af61acf58d683b42226a4180296a3fd619b87b51..6ae6cb030b70765685ee1aa22a5fe72e1707a719 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -357,7 +357,7 @@
 &i2c1 {
        clock-frequency = <100000>;
 
-       pinctrl-0 = <&i2c1_active>, <&i2c1_hid_active>;
+       pinctrl-0 = <&i2c1_active>;
        pinctrl-names = "default";
 
        status = "okay";
@@ -368,13 +368,16 @@
                hid-descr-addr = <0x1>;
 
                interrupts-extended = <&tlmm 122 IRQ_TYPE_LEVEL_LOW>;
+
+               pinctrl-0 = <&ts_int_default>;
+               pinctrl-names = "default";
        };
 };
 
 &i2c7 {
        clock-frequency = <100000>;
 
-       pinctrl-0 = <&i2c7_active>, <&i2c7_hid_active>;
+       pinctrl-0 = <&i2c7_active>;
        pinctrl-names = "default";
 
        status = "okay";
@@ -385,6 +388,9 @@
                hid-descr-addr = <0x20>;
 
                interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_LOW>;
+
+               pinctrl-0 = <&kb_int_default>;
+               pinctrl-names = "default";
        };
 
        touchpad@2c {
@@ -393,6 +399,9 @@
                hid-descr-addr = <0x20>;
 
                interrupts-extended = <&tlmm 24 IRQ_TYPE_LEVEL_LOW>;
+
+               pinctrl-0 = <&tp_int_default>;
+               pinctrl-names = "default";
        };
 };
 
@@ -669,14 +678,6 @@
                drive-strength = <2>;
        };
 
-       i2c1_hid_active: i2c1-hid-active-state {
-               pins = "gpio122";
-               function = "gpio";
-
-               bias-pull-up;
-               drive-strength = <2>;
-       };
-
        i2c7_active: i2c7-active-state {
                pins = "gpio98", "gpio99";
                function = "qup7";
@@ -685,8 +686,8 @@
                drive-strength = <2>;
        };
 
-       i2c7_hid_active: i2c7-hid-active-state {
-               pins = "gpio37", "gpio24";
+       kb_int_default: kb-int-default-state {
+               pins = "gpio37";
                function = "gpio";
 
                bias-pull-up;
@@ -718,6 +719,22 @@
                };
        };
 
+       tp_int_default: tp-int-default-state {
+               pins = "gpio24";
+               function = "gpio";
+
+               bias-pull-up;
+               drive-strength = <2>;
+       };
+
+       ts_int_default: ts-int-default-state {
+               pins = "gpio122";
+               function = "gpio";
+
+               bias-pull-up;
+               drive-strength = <2>;
+       };
+
        usbprim_sbu_default: usbprim-sbu-state {
                oe-n-pins {
                        pins = "gpio152";