arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling

Trogdor boards with a detachable keyboard don't have a trackpad over
i2c. Instead the trackpad is on the detachable keyboard base. Let's move
the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi
file so that each trogdor board that is detachable, of which there are
many, doesn't have to disable the trackpad bus.

Cc: "Joseph S. Barrera III" <joebar@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220427020339.360855-2-swboyd@chromium.org

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index c81805ef2250f1456ac53543bd701d9852cccb2c..8da61a52f150a64ec4cd1cab11337c39a7773e11 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -111,10 +111,6 @@ ap_ts_pen_1v8: &i2c4 {
        };
 };
 
-&i2c7 {
-       status = "disabled";
-};
-
 &i2c9 {
        status = "disabled";
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index bff2b556cc75b1a9869988f7990bbba72836fd65..532c7dcc3f7325f01fd436aa94acc537f0fcd765 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -88,10 +88,6 @@ ap_h1_spi: &spi0 {};
        };
 };
 
-&ap_tp_i2c {
-       status = "disabled";
-};
-
 ap_ts_pen_1v8: &i2c4 {
        status = "okay";
        clock-frequency = <400000>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 69666f92176aa7446abda2f3395231ae6d003647..75df5d1633b24939b96c727f3c9ea3e80c901f85 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -19,6 +19,10 @@ ap_h1_spi: &spi0 {};
        semtech,avg-pos-strength = <64>;
 };
 
+&ap_tp_i2c {
+       status = "okay";
+};
+
 /*
  * Lazor is stuffed with a 47k NTC as charger thermistor which currently is
  * not supported by the PM6150 ADC driver. Disable the charger thermal zone

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index e90f99ef532346929a22c7bcc506f56f9cf1a5e0..410ca2a76d8148183e5214ec2f157a489d829205 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -36,6 +36,10 @@ ap_h1_spi: &spi0 {};
        realtek,dmic-clk-driving-high = "true";
 };
 
+&ap_tp_i2c {
+       status = "okay";
+};
+
 &cpu6_alert0 {
        temperature = <60000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index 457c2549986329f90ac1941353c7aa91bfcc04f8..311c42a535ff487e5460806715a2de711e8dc0cf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -20,6 +20,10 @@ ap_h1_spi: &spi0 {};
        compatible = "google,trogdor", "qcom,sc7180";
 };
 
+&ap_tp_i2c {
+       status = "okay";
+};
+
 ap_ts_pen_1v8: &i2c4 {
        status = "okay";
        clock-frequency = <400000>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index b0efb354458c64f2d643d64893b9e4f6723e0385..7648be83f7e464d23c48446f100809e250cf3369 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -727,7 +727,6 @@ ap_sar_sensor_i2c: &i2c5 {
 };
 
 ap_tp_i2c: &i2c7 {
-       status = "okay";
        clock-frequency = <400000>;
 
        trackpad: trackpad@15 {