Merge "ARM: dts: qcom: update modem thermal configuration for kalama"

This commit is contained in:
qctecmdr
2022-03-11 09:35:54 -08:00
committed by Gerrit - the friendly Code Review server
4 changed files with 147 additions and 89 deletions

View File

@@ -77,6 +77,8 @@ Subsystem properties:
"sdr1_lte_dsc" -> DSC based sdr1 lte cooling device,
"sdr0_nr_dsc" -> DSC based sdr0 nr cooling device,
"sdr1_nr_dsc" -> DSC based sdr1 nr cooling device,
"sdr0_nr_scg_dsc" -> DSC based sdr0 nr scg cooling device,
"sdr1_nr_scg_dsc" -> DSC based sdr1 nr scg cooling device,
"pa_lte_sdr0_dsc" -> DSC based pa lte sdr0 cooling
device,
"pa_lte_sdr1_dsc" -> DSC based pa lte sdr1 cooling

View File

@@ -12,68 +12,43 @@
#cooling-cells = <2>;
};
modem_lte_sub1_dsc: modem_lte_sub1_dsc {
qcom,qmi-dev-name = "modem_lte_sub1_dsc";
#cooling-cells = <2>;
};
modem_nr_dsc: modem_nr_dsc {
qcom,qmi-dev-name = "modem_nr_dsc";
#cooling-cells = <2>;
};
modem_nr_sub1_dsc: modem_nr_sub1_dsc {
qcom,qmi-dev-name = "modem_nr_sub1_dsc";
#cooling-cells = <2>;
};
modem_nr_scg_dsc: modem_nr_scg_dsc {
qcom,qmi-dev-name = "modem_nr_scg_dsc";
#cooling-cells = <2>;
};
modem_nr_scg_sub1_dsc: modem_nr_scg_sub1_dsc {
qcom,qmi-dev-name = "modem_nr_scg_sub1_dsc";
#cooling-cells = <2>;
};
sdr0_lte_dsc: sdr0_lte_dsc {
qcom,qmi-dev-name = "sdr0_lte_dsc";
#cooling-cells = <2>;
};
sdr0_lte_sub1_dsc: sdr0_lte_sub1_dsc {
qcom,qmi-dev-name = "sdr0_lte_sub1_dsc";
#cooling-cells = <2>;
};
sdr1_lte_dsc: sdr1_lte_dsc {
qcom,qmi-dev-name = "sdr1_lte_dsc";
#cooling-cells = <2>;
};
sdr1_lte_sub1_dsc: sdr1_lte_sub1_dsc {
qcom,qmi-dev-name = "sdr1_lte_sub1_dsc";
#cooling-cells = <2>;
};
sdr0_nr_dsc: sdr0_nr_dsc {
qcom,qmi-dev-name = "sdr0_nr_dsc";
#cooling-cells = <2>;
};
sdr0_nr_sub1_dsc: sdr0_nr_sub1_dsc {
qcom,qmi-dev-name = "sdr0_nr_sub1_dsc";
#cooling-cells = <2>;
};
sdr1_nr_dsc: sdr1_nr_dsc {
qcom,qmi-dev-name = "sdr1_nr_dsc";
#cooling-cells = <2>;
};
sdr1_nr_sub1_dsc: sdr1_nr_sub1_dsc {
qcom,qmi-dev-name = "sdr1_nr_sub1_dsc";
sdr0_nr_scg_dsc: sdr0_nr_scg_dsc {
qcom,qmi-dev-name = "sdr0_nr_scg_dsc";
#cooling-cells = <2>;
};
sdr1_nr_scg_dsc: sdr1_nr_scg_dsc {
qcom,qmi-dev-name = "sdr1_nr_scg_dsc";
#cooling-cells = <2>;
};
@@ -82,113 +57,64 @@
#cooling-cells = <2>;
};
pa_lte_sdr0_sub1_dsc: pa_lte_sdr0_sub1_dsc {
qcom,qmi-dev-name = "pa_lte_sdr0_sub1_dsc";
#cooling-cells = <2>;
};
pa_lte_sdr1_dsc: pa_lte_sdr1_dsc {
qcom,qmi-dev-name = "pa_lte_sdr1_dsc";
#cooling-cells = <2>;
};
pa_lte_sdr1_sub1_dsc: pa_lte_sdr1_sub1_dsc {
qcom,qmi-dev-name = "pa_lte_sdr1_sub1_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr0_dsc: pa_nr_sdr0_dsc {
qcom,qmi-dev-name = "pa_nr_sdr0_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr0_sub1_dsc: pa_nr_sdr0_sub1_dsc {
qcom,qmi-dev-name = "pa_nr_sdr0_sub1_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr1_dsc: pa_nr_sdr1_dsc {
qcom,qmi-dev-name = "pa_nr_sdr1_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr1_sub1_dsc: pa_nr_sdr1_sub1_dsc {
qcom,qmi-dev-name = "pa_nr_sdr1_sub1_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr0_scg_dsc: pa_nr_sdr0_scg_dsc {
qcom,qmi-dev-name = "pa_nr_sdr0_scg_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr0_scg_sub1_dsc: pa_nr_sdr0_scg_sub1_dsc {
qcom,qmi-dev-name = "pa_nr_sdr0_scg_sub1_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr1_scg_dsc: pa_nr_sdr1_scg_dsc {
qcom,qmi-dev-name = "pa_nr_sdr1_scg_dsc";
#cooling-cells = <2>;
};
pa_nr_sdr1_scg_sub1_dsc: pa_nr_sdr1_scg_sub1_dsc {
qcom,qmi-dev-name = "pa_nr_sdr1_scg_sub1_dsc";
#cooling-cells = <2>;
};
mmw0_dsc: mmw0_dsc {
qcom,qmi-dev-name = "mmw0_dsc";
#cooling-cells = <2>;
};
mmw0_sub1_dsc: mmw0_sub1_dsc {
qcom,qmi-dev-name = "mmw0_sub1_dsc";
#cooling-cells = <2>;
};
mmw1_dsc: mmw1_dsc {
qcom,qmi-dev-name = "mmw1_dsc";
#cooling-cells = <2>;
};
mmw1_sub1_dsc: mmw1_sub1_dsc {
qcom,qmi-dev-name = "mmw1_sub1_dsc";
#cooling-cells = <2>;
};
mmw2_dsc: mmw2_dsc {
qcom,qmi-dev-name = "mmw2_dsc";
#cooling-cells = <2>;
};
mmw2_sub1_dsc: mmw2_sub1_dsc {
qcom,qmi-dev-name = "mmw2_sub1_dsc";
#cooling-cells = <2>;
};
mmw3_dsc: mmw3_dsc {
qcom,qmi-dev-name = "mmw3_dsc";
#cooling-cells = <2>;
};
mmw3_sub1_dsc: mmw3_sub1_dsc {
qcom,qmi-dev-name = "mmw3_sub1_dsc";
#cooling-cells = <2>;
};
mmw_ific_dsc: mmw_ific_dsc {
qcom,qmi-dev-name = "mmw_ific_dsc";
#cooling-cells = <2>;
};
mmw_ific_sub1_dsc: mmw_ific_sub1_dsc {
qcom,qmi-dev-name = "mmw_ific_sub1_dsc";
qmi_wlan: wlan {
qcom,qmi-dev-name = "wlan";
#cooling-cells = <2>;
};
qmi_wlan: wlan {
qcom,qmi-dev-name = "wlan";
modem_bw_backoff: modem_bw_backoff {
qcom,qmi-dev-name = "modem_bw_backoff";
#cooling-cells = <2>;
};
@@ -227,7 +153,14 @@
"epm4",
"epm5",
"epm6",
"epm7";
"epm7",
"sdr_mmw_therm",
"sub1_modem_cfg",
"sub1_lte_cc",
"sub1_mcg_fr1_cc",
"sub1_mcg_fr2_cc",
"sub1_scg_fr1_cc",
"sub1_scg_fr2_cc";
};
};
};
@@ -692,4 +625,108 @@
};
};
};
sdr_mmw_therm {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SDR_MMW)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
thermal-hal-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_modem_cfg {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_MODEM_CFG)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_lte_cc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_LTE_CC)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_mcg_fr1_cc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_MCG_FR1_CC)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_mcg_fr2_cc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_MCG_FR2_CC)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_scg_fr1_cc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_SCG_FR1_CC)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
sub1_scg_fr2_cc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&qmi_sensor
(QMI_MODEM_INST_ID+QMI_SUB1_SCG_FR2_CC)>;
trips {
thermal-engine-config0 {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
};
};
};

View File

@@ -98,12 +98,31 @@
};
};
pm8550vs_e_tz {
pm8550vs_d_tz {
cooling-maps {
pm8550vs_d_gpu {
trip = <&pm8550vs_d_trip0>;
cooling-device = <&msm_gpu 5 THERMAL_NO_LIMIT>;
};
};
};
pm8550ve_f_tz {
cooling-maps {
pm8550vs_e_nsp {
trip = <&pm8550vs_e_trip0>;
trip = <&pm8550ve_f_trip0>;
cooling-device = <&cdsp_sw 5 THERMAL_NO_LIMIT>;
};
pm8550vs_e_lte {
trip = <&pm8550ve_f_trip0>;
cooling-device = <&modem_lte_dsc 255 255>;
};
pm8550vs_e_nr {
trip = <&pm8550ve_f_trip0>;
cooling-device = <&modem_nr_scg_dsc 255 255>;
};
};
};
};

View File

@@ -32,7 +32,7 @@
};
&thermal_zones {
pm8550ve_f_temp_alarm: pm8550ve_f__tz {
pm8550ve_f_temp_alarm: pm8550ve_f_tz {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";