Commit aac9e2af authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Wolfram Sang
Browse files

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: <stable+noautosel@kernel.org> # Needs accompanying new driver to work
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 3fc361af

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

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ touchscreen2: touchscreen@34 { 
		compatible = "melfas,mip4_ts";

		reg = <0x34>;

		interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>;

		status = "fail-needs-probe";

	};



	/*
@@ -26,6 +27,7 @@ touchscreen3: touchscreen@20 { 
		reg = <0x20>;

		hid-descr-addr = <0x0020>;

		interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>;

		status = "fail-needs-probe";

	};



	/* Lenovo Ideapad C330 uses G2Touch touchscreen as a 2nd source touchscreen */
@@ -35,6 +37,7 @@ touchscreen@40 { 
		hid-descr-addr = <0x0001>;

		interrupt-parent = <&pio>;

		interrupts = <88 IRQ_TYPE_LEVEL_LOW>;

		status = "fail-needs-probe";

	};

};
@@ -47,6 +50,8 @@ &i2c4 { 
	trackpad2: trackpad@2c {

		compatible = "hid-over-i2c";

		interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&trackpad_irq>;

		reg = <0x2c>;

		hid-descr-addr = <0x0020>;

		/*
@@ -58,6 +63,7 @@ trackpad2: trackpad@2c { 
		 */

		vdd-supply = <&mt6397_vgp6_reg>;

		wakeup-source;

		status = "fail-needs-probe";

	};

};
@@ -82,3 +88,11 @@ pins_wp { 
		};

	};

};



&touchscreen {

	status = "fail-needs-probe";

};



&trackpad {

	status = "fail-needs-probe";

};

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

+2 −2
Original line number Diff line number Diff line
@@ -358,12 +358,12 @@ touchscreen: touchscreen@10 { 
&i2c4 {

	clock-frequency = <400000>;

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&trackpad_irq>;



	trackpad: trackpad@15 {

		compatible = "elan,ekth3000";

		interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&trackpad_irq>;

		reg = <0x15>;

		vcc-supply = <&mt6397_vgp6_reg>;

		wakeup-source;