Skip to content

Commit 8609434

Browse files
wensAngeloGioacchino Del Regno
authored andcommitted
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>
1 parent 8101382 commit 8609434

4 files changed

Lines changed: 15 additions & 6 deletions

File tree

arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,11 @@
123123
reg = <0x2c>;
124124
hid-descr-addr = <0x20>;
125125
interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
126+
pinctrl-names = "default";
127+
pinctrl-0 = <&trackpad_pin>;
126128
vdd-supply = <&pp3300_s3>;
127129
wakeup-source;
130+
status = "fail-needs-probe";
128131
};
129132
};
130133

@@ -197,3 +200,7 @@
197200
};
198201
};
199202
};
203+
204+
&trackpad {
205+
status = "fail-needs-probe";
206+
};

arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
compatible = "hid-over-i2c";
1818
reg = <0x15>;
1919
interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
20+
pinctrl-names = "default";
21+
pinctrl-0 = <&trackpad_pin>;
2022
hid-descr-addr = <0x0001>;
2123
vdd-supply = <&pp3300_s3>;
2224
wakeup-source;

arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
compatible = "hid-over-i2c";
2020
reg = <0x15>;
2121
interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
22+
pinctrl-names = "default";
23+
pinctrl-0 = <&trackpad_pin>;
2224
hid-descr-addr = <0x0001>;
2325
vdd-supply = <&pp3300_s3>;
2426
wakeup-source;

arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,19 +398,17 @@
398398

399399
&i2c2 {
400400
pinctrl-names = "default";
401-
/*
402-
* Trackpad pin put here to work around second source components
403-
* sharing the pinmux in steelix designs.
404-
*/
405-
pinctrl-0 = <&i2c2_pins>, <&trackpad_pin>;
401+
pinctrl-0 = <&i2c2_pins>;
406402
clock-frequency = <400000>;
407403
i2c-scl-internal-delay-ns = <10000>;
408404
status = "okay";
409405

410-
trackpad@15 {
406+
trackpad: trackpad@15 {
411407
compatible = "elan,ekth3000";
412408
reg = <0x15>;
413409
interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_LOW>;
410+
pinctrl-names = "default";
411+
pinctrl-0 = <&trackpad_pin>;
414412
vcc-supply = <&pp3300_s3>;
415413
wakeup-source;
416414
};

0 commit comments

Comments
 (0)