| Message ID | 20220827004901.511543-1-swboyd@chromium.org |
|---|---|
| State | Accepted |
| Commit | 144fbd028fdec2deeb3b99d5e60dbf3167950ebe |
| Headers | show |
| Series | arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ | expand |
On Fri, Aug 26, 2022 at 05:49:00PM -0700, Stephen Boyd wrote: > There's still a thermal zone using pm6150_adc in the pm6150.dtsi file, > pm6150_thermal. It's not super obvious because it indirectly uses the > adc through an iio channel in pm6150_temp. Let's keep this enabled on > lazor and coachz so that reading the temperature of the pm6150_thermal > zone continues to work. Otherwise we get -EINVAL when reading the zone, > and I suspect the PMIC temperature trip doesn't work properly so we > don't shutdown when the PMIC overheats. > > Cc: Matthias Kaehlcke <mka@chromium.org> > Fixes: b8d1e3d33487 ("arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors") > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
On Fri, 26 Aug 2022 17:49:00 -0700, Stephen Boyd wrote: > There's still a thermal zone using pm6150_adc in the pm6150.dtsi file, > pm6150_thermal. It's not super obvious because it indirectly uses the > adc through an iio channel in pm6150_temp. Let's keep this enabled on > lazor and coachz so that reading the temperature of the pm6150_thermal > zone continues to work. Otherwise we get -EINVAL when reading the zone, > and I suspect the PMIC temperature trip doesn't work properly so we > don't shutdown when the PMIC overheats. > > [...] Applied, thanks! [1/1] arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ commit: 144fbd028fdec2deeb3b99d5e60dbf3167950ebe Best regards,
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 8290d036044a..edfcd47e1a00 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -24,8 +24,6 @@ &charger_thermal { }; &pm6150_adc { - status = "disabled"; - /delete-node/ skin-temp-thermistor@4e; /delete-node/ charger-thermistor@4f; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 2cf7d5212c61..002663d752da 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -55,8 +55,6 @@ &panel { }; &pm6150_adc { - status = "disabled"; - /delete-node/ charger-thermistor@4f; };
There's still a thermal zone using pm6150_adc in the pm6150.dtsi file, pm6150_thermal. It's not super obvious because it indirectly uses the adc through an iio channel in pm6150_temp. Let's keep this enabled on lazor and coachz so that reading the temperature of the pm6150_thermal zone continues to work. Otherwise we get -EINVAL when reading the zone, and I suspect the PMIC temperature trip doesn't work properly so we don't shutdown when the PMIC overheats. Cc: Matthias Kaehlcke <mka@chromium.org> Fixes: b8d1e3d33487 ("arm64: dts: qcom: sc7180-trogdor: Delete ADC config for unused thermistors") Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 -- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 -- 2 files changed, 4 deletions(-) base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868