Commit 39441f73 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone 



Commit f73558cc83d1 ("arm64: dts: qcom: sc7180: Disable charger
thermal zone for lazor") disables the charger thermal zone for
specific lazor revisions due to an unsupported thermistor type.
The initial idea was to disable the thermal zone for older
revisions and leave it enabled for newer ones that use a
supported thermistor. Finally the thermistor won't be changed
on newer revisions, hence the thermal zone should be disabled
for all lazor (and limozeen) revisions. Instead of disabling
it per revision do it once in the shared .dtsi for lazor.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210322094628.v4.1.I6d587e7ae72a5a47253bb95dfdc3158f8cc8a157@changeid


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent caaf1f38

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

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ 
	compatible = "google,lazor-rev0", "qcom,sc7180";

};



/*

 * 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

 * to avoid using bogus temperature values.

 */

&charger_thermal {

	status = "disabled";

};



&pp3300_hub {

	/* pp3300_l7c is used to power the USB hub */

	/delete-property/regulator-always-on;

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

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ 
	compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180";

};



/*

 * 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

 * to avoid using bogus temperature values.

 */

&charger_thermal {

	status = "disabled";

};



&pp3300_hub {

	/* pp3300_l7c is used to power the USB hub */

	/delete-property/regulator-always-on;

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

+0 −9
Original line number Diff line number Diff line
@@ -14,12 +14,3 @@ 
	model = "Google Lazor (rev3+)";

	compatible = "google,lazor", "qcom,sc7180";

};
 


/*

 * 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

 * to avoid using bogus temperature values.

 */

&charger_thermal {

	status = "disabled";

};

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

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,15 @@ ap_h1_spi: &spi0 {}; 
	semtech,avg-pos-strength = <64>;

};



/*

 * 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

 * to avoid using bogus temperature values.

 */

&charger_thermal {

	status = "disabled";

};



ap_ts_pen_1v8: &i2c4 {

	status = "okay";

	clock-frequency = <400000>;