Skip to content

Commit 798f1df

Browse files
lumagandersson
authored andcommitted
arm64: dts: qcom: qrb5165-rb5: fix thermal zone conflict
The commit 3a78608 ("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: 3a78608 ("arm64: dts: qcom: Add missing "-thermal" suffix for thermal zones") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20230613131224.666668-1-dmitry.baryshkov@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 4d29db2 commit 798f1df

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
};
122122
};
123123

124-
pm8150l-thermal {
124+
pm8150l-pcb-thermal {
125125
polling-delay-passive = <0>;
126126
polling-delay = <0>;
127127
thermal-sensors = <&pm8150l_adc_tm 1>;

0 commit comments

Comments
 (0)