arm64: dts: mediatek: mt8183: Switch to Elan touchscreen driver

After commit 2be404486c05 ("HID: i2c-hid-of: Add reset GPIO support to
i2c-hid-of"), the i2c-hid-of driver used by some mt8183 devices resets
the touchscreen without having enough post-reset delay. This makes those
touchscreen fail to get probed.

Switch to Elan touchscreen driver, which has enough post-reset delay.

Fixes: 2be404486c05 ("HID: i2c-hid-of: Add reset GPIO support to i2c-hid-of")
Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
index 3935d83..7bc7c26 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
@@ -14,16 +14,13 @@
 };
 
 &touchscreen {
-       status = "okay";
+       compatible = "elan,ekth6a12nay";
 
-       compatible = "hid-over-i2c";
-       reg = <0x10>;
-       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 
-       post-power-on-delay-ms = <10>;
-       hid-descr-addr = <0x0001>;
+       vcc33-supply = <&pp3300_alw>;
+       vccio-supply = <&pp1800_alw>;
 };
 
 &mt6358codec {

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
index 72852b7..863f3e4 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
@@ -27,16 +27,12 @@
 };
 
 &touchscreen {
-       status = "okay";
+       compatible = "elan,ekth6a12nay";
 
-       compatible = "hid-over-i2c";
-       reg = <0x10>;
-       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 
-       post-power-on-delay-ms = <10>;
-       hid-descr-addr = <0x0001>;
+       vcc33-supply = <&pp3300_alw>;
 };
 
 &qca_wifi {

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
index 757d0af..e0a583c 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
@@ -14,16 +14,12 @@
 };
 
 &touchscreen {
-       status = "okay";
+       compatible = "elan,ekth6a12nay";
 
-       compatible = "hid-over-i2c";
-       reg = <0x10>;
-       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 
-       post-power-on-delay-ms = <10>;
-       hid-descr-addr = <0x0001>;
+       vcc33-supply = <&pp3300_alw>;
 };
 
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
index 6641b08..7874c9a 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
@@ -14,16 +14,12 @@
 };
 
 &touchscreen {
-       status = "okay";
+       compatible = "elan,ekth6a12nay";
 
-       compatible = "hid-over-i2c";
-       reg = <0x10>;
-       interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&touchscreen_pins>;
 
-       post-power-on-delay-ms = <10>;
-       hid-descr-addr = <0x0001>;
+       vcc33-supply = <&pp3300_alw>;
 };