Skip to content

Commit

Permalink
dts / beryllium : Inline with b1c1
Browse files Browse the repository at this point in the history 
This commit renames all thermal channels according to `sdm845-b1c1-thermal`
configuration, accordingly:

`cam_therm0`    = `sdm_therm`
`cam_therm1`    = `quiet_therm`
`pa_therm0`     = `fps_therm`
`pa_therm1`     = `pa_therm`
`quiet_therm`   = `pmi_therm`

`backlight_therm` is deleted because of it's seems unused.

Signed-off-by: Rapherion Rollerscaperers <[email protected]>
  • Loading branch information
@raphielscape @PainKiller3
raphielscape authored and PainKiller3 committed Jun 11, 2022
1 parent 123ef0e commit 4191ac8
Showing 1 changed file with 84 additions and 51 deletions.
135 changes: 84 additions & 51 deletions arch/arm64/boot/dts/qcom/beryllium-p0.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@
};

chan@4d {
label = "cam_therm0";
label = "sdm_therm";
reg = <0x4d>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
Expand All @@ -605,7 +605,7 @@
};

chan@4e {
label = "cam_therm1";
label = "quiet_therm";
reg = <0x4e>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
Expand All @@ -616,7 +616,7 @@
};

chan@4f {
label = "pa_therm0";
label = "fps_therm";
reg = <0x4f>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
Expand All @@ -627,7 +627,7 @@
};

chan@50 {
label = "pa_therm1";
label = "pa_therm";
reg = <0x50>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
Expand All @@ -638,7 +638,7 @@
};

chan@51 {
label = "quiet_therm";
label = "pmi_therm";
reg = <0x51>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
Expand All @@ -647,17 +647,6 @@
qcom,hw-settle-time = <2>;
qcom,fast-avg-setup = <0>;
};

chan@52 {
label = "backlight_therm";
reg = <0x52>;
qcom,decimation = <2>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "absolute";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,fast-avg-setup = <0>;
};
};

&pm8998_adc_tm {
Expand All @@ -683,40 +672,40 @@
};

chan@4d {
label = "cam_therm0";
label = "sdm_therm";
reg = <0x4d>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "ratiometric";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,btm-channel-number = <0x88>;
qcom,btm-channel-number = <0x70>;
qcom,thermal-node;
};

chan@4e {
label = "cam_therm1";
label = "quiet_therm";
reg = <0x4e>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "ratiometric";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,btm-channel-number = <0x70>;
qcom,btm-channel-number = <0x78>;
qcom,thermal-node;
};

chan@4f {
label = "pa_therm0";
label = "fps_therm";
reg = <0x4f>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "ratiometric";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,btm-channel-number = <0x78>;
qcom,btm-channel-number = <0x98>;
qcom,thermal-node;
};

chan@50 {
label = "pa_therm1";
label = "pa_therm";
reg = <0x50>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "ratiometric";
Expand All @@ -727,24 +716,13 @@
};

chan@51 {
label = "quiet_therm";
label = "pmi_therm";
reg = <0x51>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "ratiometric";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,btm-channel-number = <0x80>;
qcom,thermal-node;
};

chan@52 {
label = "backlight_therm";
reg = <0x52>;
qcom,pre-div-channel-scaling = <0>;
qcom,calibration-type = "absolute";
qcom,scale-function = <2>;
qcom,hw-settle-time = <2>;
qcom,btm-channel-number = <0x98>;
qcom,btm-channel-number = <0x88>;
qcom,thermal-node;
};
};
Expand Down Expand Up @@ -865,10 +843,10 @@
};
};

xo_therm {
sdm-therm-adc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x4c>;
thermal-sensors = <&pm8998_adc_tm 0x4d>;
thermal-governor = "user_space";
wake-capable-sensor;

Expand All @@ -881,12 +859,13 @@
};
};

cam_therm0 {
quiet-therm-adc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x4d>;
thermal-sensors = <&pm8998_adc_tm 0x4e>;
thermal-governor = "user_space";
wake-capable-sensor;
disable-thermal-zone;

trips {
active-config0 {
Expand All @@ -897,28 +876,83 @@
};
};

cam_therm1 {
backup-charge {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x4e>;
thermal-sensors = <&pm8998_adc_tm 0x4f>;
thermal-governor = "step_wise";
wake-capable-sensor;
disable-thermal-zone;

trips {
batt_charging_lv1: batt-charging_lv1 {
temperature = <39000>;
hysteresis = <1000>;
type = "passive";
};
batt_charging_lv2: batt-charging_lv2 {
temperature = <41000>;
hysteresis = <1000>;
type = "passive";
};
batt_charging_lv3: batt-charging_lv3 {
temperature = <43000>;
hysteresis = <1000>;
type = "passive";
};
batt_charging_lv4: batt-charging_lv4 {
temperature = <48000>;
hysteresis = <1000>;
type = "passive";
};
};
cooling-maps {
charging_cdev_lv1 {
trip = <&batt_charging_lv1>;
cooling-device = <&pmi8998_charger 1 1>;
};
charging_cdev_lv2 {
trip = <&batt_charging_lv2>;
cooling-device = <&pmi8998_charger 2 2>;
};
charging_cdev_lv3 {
trip = <&batt_charging_lv3>;
cooling-device = <&pmi8998_charger 3 3>;
};
charging_cdev_lv4 {
trip = <&batt_charging_lv4>;
cooling-device = <&pmi8998_charger 4 4>;
};
};
};

fps-therm-adc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x4f>;
thermal-governor = "user_space";
wake-capable-sensor;
disable-thermal-zone;

trips {
active-config0 {
temperature = <125000>;
hysteresis = <10000>;
type = "passive";
};
shutdown-config {
temperature = <59000>;
hysteresis = <1000>;
type = "critical";
};
};
};

pa_therm0 {
fps-therm-monitor {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x4f>;
thermal-governor = "user_space";
wake-capable-sensor;

trips {
active-config0 {
Expand All @@ -929,10 +963,10 @@
};
};

pa_therm1 {
pmi_therm-adc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x50>;
thermal-sensors = <&pm8998_adc_tm 0x51>;
thermal-governor = "user_space";
wake-capable-sensor;

Expand All @@ -945,10 +979,10 @@
};
};

quiet_therm {
pa-therm-adc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x51>;
thermal-sensors = <&pm8998_adc_tm 0x50>;
thermal-governor = "user_space";
wake-capable-sensor;

Expand All @@ -961,12 +995,11 @@
};
};

backlight_therm {
usbc-therm-monitor {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&pm8998_adc_tm 0x52>;
thermal-sensors = <&pm8998_adc_tm 0x4f>;
thermal-governor = "user_space";
wake-capable-sensor;

trips {
active-config0 {
Expand Down

0 comments on commit 4191ac8

Please sign in to comment.