LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors
@ 2021-09-02 22:47 Matthias Kaehlcke
  2021-09-03  0:20 ` Stephen Boyd
  0 siblings, 1 reply; 3+ messages in thread
From: Matthias Kaehlcke @ 2021-09-02 22:47 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Rob Herring
  Cc: Stephen Boyd, linux-kernel, linux-arm-msm, devicetree,
	Douglas Anderson, Matthias Kaehlcke

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 thermal
monitor since there are no other temperatures to monitor.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---

 .../arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 12 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi   | 10 ++++++++++
 .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts |  8 ++++++++
 .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts |  8 ++++++++
 4 files changed, 38 insertions(+)

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 21b516e0694a..edfcd47e1a00 100644
--- 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,18 @@ &charger_thermal {
 	status = "disabled";
 };
 
+&pm6150_adc {
+	/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 00535aaa43c9..57f7b19f83b0 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -54,6 +54,16 @@ &panel {
 	compatible = "boe,nv133fhm-n62";
 };
 
+&pm6150_adc {
+	/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 e122a6b481ff..76a130bad60a 100644
--- 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 @@ &charger_thermal {
 	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 4f32e6733f4c..88cf2246c18a 100644
--- 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;
+};
-- 
2.33.0.153.gba50c8fa24-goog


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors
  2021-09-02 22:47 [PATCH] arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors Matthias Kaehlcke
@ 2021-09-03  0:20 ` Stephen Boyd
  2021-09-03 19:00   ` Matthias Kaehlcke
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2021-09-03  0:20 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Matthias Kaehlcke, Rob Herring
  Cc: linux-kernel, linux-arm-msm, devicetree, Douglas Anderson

Quoting Matthias Kaehlcke (2021-09-02 15:47:44)
> 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 thermal
> monitor since there are no other temperatures to monitor.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
>
>  .../arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 12 ++++++++++++
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi   | 10 ++++++++++
>  .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts |  8 ++++++++
>  .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts |  8 ++++++++
>  4 files changed, 38 insertions(+)
>
> 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 21b516e0694a..edfcd47e1a00 100644
> --- 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,18 @@ &charger_thermal {
>         status = "disabled";
>  };
>
> +&pm6150_adc {
> +       /delete-node/ skin-temp-thermistor@4e;
> +       /delete-node/ charger-thermistor@4f;

Is there any other child node? I only see two, unless I missed
something. In which case the whole node can be disabled?

> +};
> +
> +&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 00535aaa43c9..57f7b19f83b0 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
> @@ -54,6 +54,16 @@ &panel {
>         compatible = "boe,nv133fhm-n62";
>  };
>
> +&pm6150_adc {
> +       /delete-node/ charger-thermistor@4f;

Same question here.

> +};
> +
> +&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 e122a6b481ff..76a130bad60a 100644
> --- 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 @@ &charger_thermal {
>         status = "disabled";
>  };
>
> +&pm6150_adc {
> +       /delete-node/ charger-thermistor@4f;

I see there's a 5v choke so this looks good as still enabled.

> +};
> +
> +&pm6150_adc_tm {
> +       /delete-node/ charger-thermistor@0;
> +};
> +
>  &pp3300_hub {
>         /* pp3300_l7c is used to power the USB hub */
>         /delete-property/regulator-always-on;

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors
  2021-09-03  0:20 ` Stephen Boyd
@ 2021-09-03 19:00   ` Matthias Kaehlcke
  0 siblings, 0 replies; 3+ messages in thread
From: Matthias Kaehlcke @ 2021-09-03 19:00 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: Andy Gross, Bjorn Andersson, Rob Herring, linux-kernel,
	linux-arm-msm, devicetree, Douglas Anderson

On Thu, Sep 02, 2021 at 05:20:43PM -0700, Stephen Boyd wrote:
> Quoting Matthias Kaehlcke (2021-09-02 15:47:44)
> > 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 thermal
> > monitor since there are no other temperatures to monitor.
> >
> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> > ---
> >
> >  .../arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 12 ++++++++++++
> >  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi   | 10 ++++++++++
> >  .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts |  8 ++++++++
> >  .../arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts |  8 ++++++++
> >  4 files changed, 38 insertions(+)
> >
> > 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 21b516e0694a..edfcd47e1a00 100644
> > --- 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,18 @@ &charger_thermal {
> >         status = "disabled";
> >  };
> >
> > +&pm6150_adc {
> > +       /delete-node/ skin-temp-thermistor@4e;
> > +       /delete-node/ charger-thermistor@4f;
> 
> Is there any other child node? I only see two, unless I missed
> something. In which case the whole node can be disabled?

Right, the ADC itself can also be disabled in this case.

> 
> > +};
> > +
> > +&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 00535aaa43c9..57f7b19f83b0 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
> > @@ -54,6 +54,16 @@ &panel {
> >         compatible = "boe,nv133fhm-n62";
> >  };
> >
> > +&pm6150_adc {
> > +       /delete-node/ charger-thermistor@4f;
> 
> Same question here.

Yes, the ADC can be disabled here too.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-03 19:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-02 22:47 [PATCH] arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors Matthias Kaehlcke
2021-09-03  0:20 ` Stephen Boyd
2021-09-03 19:00   ` Matthias Kaehlcke

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).