Commit ce250024 authored by Douglas Anderson's avatar Douglas Anderson Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: Prep sc7180-trogdor trackpad IRQ for new boards 



The trackpad interrupt got renamed and also moved to a new GPIO on
newer boards.  Let's do the move in the "trogdor.dtsi" file and then
undo it in the two old boards.

NOTE: since none of the new boards have device trees yet, this change
looks silly on its own but it will make sense after more boards are
supported.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.3.Iddf6dc8102aa4fbc3847936226fc7bf2e2cd315c@changeid


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent b4b2c20d

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -58,8 +58,22 @@ ap_ts_pen_1v8: &i2c4 { 
	};

};



&trackpad {

	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;

};



/* PINCTRL - modifications to sc7180-trogdor.dtsi */



&trackpad_int_1v8_odl {

	pinmux {

		pins = "gpio58";

	};



	pinconf {

		pins = "gpio58";

	};

};



&ts_reset_l {

	pinconf {

		/* This pin is not connected on -rev0, pull up to park. */

arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts

+16 −0
Original line number Diff line number Diff line
@@ -68,6 +68,22 @@ ap_ts_pen_1v8: &i2c4 { 
	status = "okay";

};



&trackpad {

	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;

};



/* PINCTRL - modifications to sc7180-trogdor.dtsi */



&trackpad_int_1v8_odl {

	pinmux {

		pins = "gpio58";

	};



	pinconf {

		pins = "gpio58";

	};

};



/* PINCTRL - board-specific pinctrl */



&tlmm {

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -644,14 +644,14 @@ ap_tp_i2c: &i2c7 { 
	status = "okay";

	clock-frequency = <400000>;



	trackpad@15 {

	trackpad: trackpad@15 {

		compatible = "elan,ekth3000";

		reg = <0x15>;

		pinctrl-names = "default";

		pinctrl-0 = <&trackpad_int_1v8_odl>;

		pinctrl-0 = <&tp_int_odl>;



		interrupt-parent = <&tlmm>;

		interrupts = <58 IRQ_TYPE_EDGE_FALLING>;

		interrupts = <0 IRQ_TYPE_EDGE_FALLING>;



		vcc-supply = <&pp3300_fp_tp>;
@@ -1412,14 +1412,16 @@ ap_spi_fp: &spi10 { 
		};

	};



	trackpad_int_1v8_odl: trackpad-int-1v8-odl {

	/* Named trackpad_int_1v8_odl on earlier revision schematics */

	trackpad_int_1v8_odl:

	tp_int_odl: tp-int-odl {

		pinmux {

			pins = "gpio58";

			pins = "gpio0";

			function = "gpio";

		};



		pinconf {

			pins = "gpio58";

			pins = "gpio0";



			/* Has external pullup */

			bias-disable;