diff options
| author | Stephen Boyd <swboyd@chromium.org> | 2022-08-26 17:49:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-21 12:38:33 +0200 |
| commit | 60ce185cf76453f1b7af59c55fad4b9547db21e7 (patch) | |
| tree | 1df57f406eb79a346ca56ad064cb72695114a8f6 /arch | |
| parent | c93e51f5348594fbf0a9a1889fbddc055cf490d8 (diff) | |
| download | linux-stable-60ce185cf76453f1b7af59c55fad4b9547db21e7.tar.gz linux-stable-60ce185cf76453f1b7af59c55fad4b9547db21e7.tar.bz2 linux-stable-60ce185cf76453f1b7af59c55fad4b9547db21e7.zip | |
arm64: dts: qcom: sc7180-trogdor: Keep pm6150_adc enabled for TZ
[ Upstream commit 144fbd028fdec2deeb3b99d5e60dbf3167950ebe ]
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>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220827004901.511543-1-swboyd@chromium.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 |
2 files changed, 0 insertions, 4 deletions
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 @@ }; &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 @@ ap_ts_pen_1v8: &i2c4 { }; &pm6150_adc { - status = "disabled"; - /delete-node/ charger-thermistor@4f; }; |