arm64: dts: mediatek: mt8186-steelix: Mark second source components for probing

Steelix design has two possible trackpad component sources. Currently
they are all marked as available, along with having workarounds for
shared pinctrl muxing and GPIOs.

Instead, mark them all as "fail-needs-probe" and have the implementation
try to probe which one is present.

Also remove the shared resource workaround by moving the pinctrl entry
for the trackpad interrupt line back into the individual trackpad nodes.

Cc: stable+noautosel@kernel.org # Needs accompanying new driver to work
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20250617082004.1653492-5-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi
index e74e886a00cbef4ba4025fe7101ca68a77069524..822a177e7c19ce0c93632904c3f40566a44ac089 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi
@@ -123,8 +123,11 @@
                reg = <0x2c>;
                hid-descr-addr = <0x20>;
                interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pin>;
                vdd-supply = <&pp3300_s3>;
                wakeup-source;
+               status = "fail-needs-probe";
        };
 };
 
@@ -197,3 +200,7 @@
                };
        };
 };
+
+&trackpad {
+       status = "fail-needs-probe";
+};

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts
index c3ae6f9616c8fd43db4d9acb43e32aa131aabca8..4dbf2cb73a81e15d1ac1afc73cf1b6174c950331 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts
@@ -17,6 +17,8 @@
                compatible = "hid-over-i2c";
                reg = <0x15>;
                interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pin>;
                hid-descr-addr = <0x0001>;
                vdd-supply = <&pp3300_s3>;
                wakeup-source;

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts
index 447b57b12b415a3c1111c04b3ab33ce377ac32bd..ee5bc2cd9e9feb913eed9565b8f22c75c82518ac 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts
@@ -19,6 +19,8 @@
                compatible = "hid-over-i2c";
                reg = <0x15>;
                interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pin>;
                hid-descr-addr = <0x0001>;
                vdd-supply = <&pp3300_s3>;
                wakeup-source;

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
index 18cfc99cfa3c33d98bec8e1b1954bb35d6aadec6..ff20376a44d7a511d208f07f89107c123a4d6f11 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
@@ -398,19 +398,17 @@
 
 &i2c2 {
        pinctrl-names = "default";
-       /*
-        * Trackpad pin put here to work around second source components
-        * sharing the pinmux in steelix designs.
-        */
-       pinctrl-0 = <&i2c2_pins>, <&trackpad_pin>;
+       pinctrl-0 = <&i2c2_pins>;
        clock-frequency = <400000>;
        i2c-scl-internal-delay-ns = <10000>;
        status = "okay";
 
-       trackpad@15 {
+       trackpad: trackpad@15 {
                compatible = "elan,ekth3000";
                reg = <0x15>;
                interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&trackpad_pin>;
                vcc-supply = <&pp3300_s3>;
                wakeup-source;
        };