korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-05 18:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Stephen Boyd 2022-04-26 19:03:37 -07:00 committed by Bjorn Andersson
parent 366a0a194b
commit 51d30402be
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,10 +111,6 @@ ap_ts_pen_1v8: &i2c4 {
};
};
&i2c7 {
status = "disabled";
};
&i2c9 {
status = "disabled";
};

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

@ -88,10 +88,6 @@ ap_h1_spi: &spi0 {};
};
};
&ap_tp_i2c {
status = "disabled";
};
ap_ts_pen_1v8: &i2c4 {
status = "okay";
clock-frequency = <400000>;

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

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

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

@ -36,6 +36,10 @@ ap_h1_spi: &spi0 {};
realtek,dmic-clk-driving-high = "true";
};
&ap_tp_i2c {
status = "okay";
};
&cpu6_alert0 {
temperature = <60000>;
};

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

@ -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>;

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

@ -727,7 +727,6 @@ ap_sar_sensor_i2c: &i2c5 {
};
ap_tp_i2c: &i2c7 {
status = "okay";
clock-frequency = <400000>;
trackpad: trackpad@15 {