Merge "ARM: dts: msm: Remove sys-therm-1 from thermal zones for tuna"

This commit is contained in:
QCTECMDR Service
2024-11-22 20:25:45 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -184,25 +184,6 @@
}; };
}; };
sys-therm-1 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pmk8550_vadc PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>;
trips {
active-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
active-config1 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sys-therm-2 { sys-therm-2 {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
@@ -432,13 +413,13 @@
pm8550vs_g_die_temp { pm8550vs_g_die_temp {
reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(6)>; reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
label = "pm8550vs_j_die_temp"; label = "pm8550vs_g_die_temp";
qcom,pre-scaling = <1 1>; qcom,pre-scaling = <1 1>;
}; };
pm8550ve_f_die_temp { pm8550ve_f_die_temp {
reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>; reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
label = "pm8550ve_d_die_temp"; label = "pm8550ve_f_die_temp";
qcom,pre-scaling = <1 1>; qcom,pre-scaling = <1 1>;
}; };
@@ -458,3 +439,8 @@
io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(5)>; io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
io-channel-names = "thermal"; io-channel-names = "thermal";
}; };
&pmxr2230_tz {
io-channels = <&pmk8550_vadc PMXR2230_ADC5_GEN3_DIE_TEMP>;
io-channel-names = "thermal";
};