On 13.06.2023 15:12, 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).
>
> 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@xxxxxxxxxx>
> ---
Wonder if one can add some sort of non-label override warnings in
dtc.. That would be useful!
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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>;
