arm64: dts: mediatek: mt8192-asurada-spherion: Mark trackpads as fail-needs-probe

Different Spherion variants use different trackpads on the same I2C2
bus. Instead of enabling all of them by default, mark them as
"fail-needs-probe" and let the implementation determine which one is
actually present.

Additionally, move the trackpad pinctrl entry back to the individual
trackpad nodes.

Signed-off-by: Laura Nao <laura.nao@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20250318102259.189289-3-laura.nao@collabora.com
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
index 8c485c3ced2c818af3d0ea64c92ba72590f1d7ce..163960f58db5c3224d58d84ad80c7c961a4d43e2 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
@@ -85,8 +85,15 @@
        trackpad@2c {
                compatible = "hid-over-i2c";
                reg = <0x2c>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pins>;
                hid-descr-addr = <0x20>;
                interrupts-extended = <&pio 15 IRQ_TYPE_LEVEL_LOW>;
                wakeup-source;
+               status = "fail-needs-probe";
        };
 };
+
+&trackpad {
+       status = "fail-needs-probe";
+};

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
index a611957ac01ca960578f50d3dbadf9e9a3c377f9..0b4664f044a159e389da7db05725ca8729fb4fa7 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
@@ -346,11 +346,13 @@
        clock-frequency = <400000>;
        clock-stretch-ns = <12600>;
        pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins>, <&trackpad_pins>;
+       pinctrl-0 = <&i2c2_pins>;
 
-       trackpad@15 {
+       trackpad: trackpad@15 {
                compatible = "elan,ekth3000";
                reg = <0x15>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pins>;
                interrupts-extended = <&pio 15 IRQ_TYPE_LEVEL_LOW>;
                vcc-supply = <&pp3300_u>;
                wakeup-source;