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: 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>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 89e5cd29ec091bebd3221c445ff156a91759fd88..11269522da508f899b619d2a68e73224d208bd52 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -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. */

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index 2cb522d6962e5fa3d86975af0d452bdcc0abcaeb..bd2c783e0f2f672529347f40b65f2814e521e62b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -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 {

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 47eed134c733394fec678d0883ed020b84d15f10..b471503e415eb3024e0d5d9dd447a9f08edd50d9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -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;