| Message ID | 20230613131224.666668-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 798f1df86e5709b7b6aedf493cc04c7fedbf544a |
| Headers | show |
| Series | arm64: dts: qcom: qrb5165-rb5: fix thermal zone conflict | expand |
On Tue, 13 Jun 2023 16:12:24 +0300, Dmitry Baryshkov wrote: > The commit 3a786086c6f8 ("arm64: dts: qcom: Add missing "-thermal" > suffix for thermal zones") renamed the thermal zone in the pm8150l.dtsi > file to comply with the schema. However this resulted in a clash with > the RB5 board file, which already contained the pm8150l-thermal zone for > the on-board sensor. This resulted in the board file definition > overriding the thermal zone defined in the PMIC include file (and thus > the on-die PMIC temp alarm was not probing at all). > > [...] Applied, thanks! [1/1] arm64: dts: qcom: qrb5165-rb5: fix thermal zone conflict commit: 798f1df86e5709b7b6aedf493cc04c7fedbf544a Best regards,
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index dd924331b0ee..ec066a89436a 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -121,7 +121,7 @@ active-config0 { }; }; - pm8150l-thermal { + pm8150l-pcb-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&pm8150l_adc_tm 1>;
The commit 3a786086c6f8 ("arm64: dts: qcom: Add missing "-thermal" suffix for thermal zones") renamed the thermal zone in the pm8150l.dtsi file to comply with the schema. However this resulted in a clash with the RB5 board file, which already contained the pm8150l-thermal zone for the on-board sensor. This resulted in the board file definition overriding the thermal zone defined in the PMIC include file (and thus the on-die PMIC temp alarm was not probing at all). Rename the thermal zone in qcom/qrb5165-rb5.dts to remove this override. Fixes: 3a786086c6f8 ("arm64: dts: qcom: Add missing "-thermal" suffix for thermal zones") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)