Skip to content

Commit

Permalink
arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Stephen Boyd authored and Bjorn Andersson committed May 6, 2022
1 parent 366a0a1 commit 51d3040
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
4 changes: 0 additions & 4 deletions arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ ap_ts_pen_1v8: &i2c4 {
};
};

&i2c7 {
status = "disabled";
};

&i2c9 {
status = "disabled";
};
Expand Down
4 changes: 0 additions & 4 deletions arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ ap_h1_spi: &spi0 {};
};
};

&ap_tp_i2c {
status = "disabled";
};

ap_ts_pen_1v8: &i2c4 {
status = "okay";
clock-frequency = <400000>;
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ ap_h1_spi: &spi0 {};
realtek,dmic-clk-driving-high = "true";
};

&ap_tp_i2c {
status = "okay";
};

&cpu6_alert0 {
temperature = <60000>;
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,6 @@ ap_sar_sensor_i2c: &i2c5 {
};

ap_tp_i2c: &i2c7 {
status = "okay";
clock-frequency = <400000>;

trackpad: trackpad@15 {
Expand Down

0 comments on commit 51d3040

Please sign in to comment.