mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 08:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.3.Iddf6dc8102aa4fbc3847936226fc7bf2e2cd315c@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Douglas Anderson
2021-03-01 13:34:27 -08:00
committed by Bjorn Andersson
parent b4b2c20d62
commit ce25002429
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,22 @@ ap_ts: touchscreen@10 {
};
};
&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. */

16
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
View File

@@ -68,6 +68,22 @@ &sdhc_2 {
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 {

14
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
View File

@@ -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 @@ pinconf-rx {
};
};
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;