arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors

The charger thermistor on Lazor, CoachZ rev1 and Pompom rev1+2 is
either the wrong part or not stuffed at all, the same is true for
the skin temperature thermistor on CoachZ rev1. The corresponding
thermal zones are already disabled for these devices, in addition
delete the ADC nodes of the thermistors.

For Lazor and CoachZ rev1 also disable the PM6150 ADC and thermal
monitor since none of the ADC channels is used.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210903122212.v2.1.I9777d0036ecbb749a4fb9ebb892f94c6e3a51772@changeid

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
index 21b516e..8290d03 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
@@ -23,6 +23,20 @@
        status = "disabled";
 };
 
+&pm6150_adc {
+       status = "disabled";
+
+       /delete-node/ skin-temp-thermistor@4e;
+       /delete-node/ charger-thermistor@4f;
+};
+
+&pm6150_adc_tm {
+       status = "disabled";
+
+       /delete-node/ charger-thermistor@0;
+       /delete-node/ skin-temp-thermistor@1;
+};
+
 /*
  * CoachZ rev1 is stuffed with a 47k NTC as thermistor for skin temperature,
  * which currently is not supported by the PM6150 ADC driver. Disable the

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 00535aa..86c9e75 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -54,6 +54,18 @@ ap_ts_pen_1v8: &i2c4 {
        compatible = "boe,nv133fhm-n62";
 };
 
+&pm6150_adc {
+       status = "disabled";
+
+       /delete-node/ charger-thermistor@4f;
+};
+
+&pm6150_adc_tm {
+       status = "disabled";
+
+       /delete-node/ charger-thermistor@0;
+};
+
 &trackpad {
        interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
index e122a6b..76a130b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
@@ -26,6 +26,14 @@
        status = "disabled";
 };
 
+&pm6150_adc {
+       /delete-node/ charger-thermistor@4f;
+};
+
+&pm6150_adc_tm {
+       /delete-node/ charger-thermistor@0;
+};
+
 &pp3300_hub {
        /* pp3300_l7c is used to power the USB hub */
        /delete-property/regulator-always-on;

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
index 4f32e67..88cf224 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
@@ -22,3 +22,11 @@
 &charger_thermal {
        status = "disabled";
 };
+
+&pm6150_adc {
+       /delete-node/ charger-thermistor@4f;
+};
+
+&pm6150_adc_tm {
+       /delete-node/ charger-thermistor@0;
+};