Skip to content

Commit aac9e2a

Browse files
wensWolfram Sang
authored andcommitted
arm64: dts: mediatek: mt8173-elm-hana: Mark touchscreens and trackpads as fail
Instead of having them all available, 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: <[email protected]> # Needs accompanying new driver to work Signed-off-by: Chen-Yu Tsai <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Acked-by: AngeloGioacchino Del Regno <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 3fc361a commit aac9e2a

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
compatible = "melfas,mip4_ts";
1515
reg = <0x34>;
1616
interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>;
17+
status = "fail-needs-probe";
1718
};
1819

1920
/*
@@ -26,6 +27,7 @@
2627
reg = <0x20>;
2728
hid-descr-addr = <0x0020>;
2829
interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>;
30+
status = "fail-needs-probe";
2931
};
3032

3133
/* Lenovo Ideapad C330 uses G2Touch touchscreen as a 2nd source touchscreen */
@@ -35,6 +37,7 @@
3537
hid-descr-addr = <0x0001>;
3638
interrupt-parent = <&pio>;
3739
interrupts = <88 IRQ_TYPE_LEVEL_LOW>;
40+
status = "fail-needs-probe";
3841
};
3942
};
4043

@@ -47,6 +50,8 @@
4750
trackpad2: trackpad@2c {
4851
compatible = "hid-over-i2c";
4952
interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>;
53+
pinctrl-names = "default";
54+
pinctrl-0 = <&trackpad_irq>;
5055
reg = <0x2c>;
5156
hid-descr-addr = <0x0020>;
5257
/*
@@ -58,6 +63,7 @@
5863
*/
5964
vdd-supply = <&mt6397_vgp6_reg>;
6065
wakeup-source;
66+
status = "fail-needs-probe";
6167
};
6268
};
6369

@@ -82,3 +88,11 @@
8288
};
8389
};
8490
};
91+
92+
&touchscreen {
93+
status = "fail-needs-probe";
94+
};
95+
96+
&trackpad {
97+
status = "fail-needs-probe";
98+
};

arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,12 +358,12 @@
358358
&i2c4 {
359359
clock-frequency = <400000>;
360360
status = "okay";
361-
pinctrl-names = "default";
362-
pinctrl-0 = <&trackpad_irq>;
363361

364362
trackpad: trackpad@15 {
365363
compatible = "elan,ekth3000";
366364
interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>;
365+
pinctrl-names = "default";
366+
pinctrl-0 = <&trackpad_irq>;
367367
reg = <0x15>;
368368
vcc-supply = <&mt6397_vgp6_reg>;
369369
wakeup-source;

0 commit comments

Comments
 (0)