Commit 51d30402 authored by Stephen Boyd's avatar Stephen Boyd Committed by Bjorn Andersson
Browse files

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: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220427020339.360855-2-swboyd@chromium.org
parent 366a0a19

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

+0 −4
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ ap_ts_pen_1v8: &i2c4 { 
	};

};



&i2c7 {

	status = "disabled";

};



&i2c9 {

	status = "disabled";

};

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

+0 −4
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ ap_h1_spi: &spi0 {}; 
	};

};



&ap_tp_i2c {

	status = "disabled";

};



ap_ts_pen_1v8: &i2c4 {

	status = "okay";

	clock-frequency = <400000>;

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

+4 −0
Original line number Diff line number Diff line
@@ -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

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

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ ap_h1_spi: &spi0 {}; 
	realtek,dmic-clk-driving-high = "true";

};



&ap_tp_i2c {

	status = "okay";

};



&cpu6_alert0 {

	temperature = <60000>;

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts

+4 −0
Original line number Diff line number Diff line
@@ -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>;