Evolution-x-devices/kernel_xiaomi_sm8450-devicetrees
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_xiaomi_sm8450-devicetrees synced 2026-02-01 04:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ARM: dts: msm: Update CPU phandles for Lahaina instead of mask"

Browse Source
This commit is contained in:
qctecmdr
2021-02-18 11:02:53 -08:00
committed by Gerrit - the friendly Code Review server
parent ab1e370cd5 4cfaf08257
commit 81c813086c
9 changed files with 553 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
qcom/lahaina-thermal.dtsi
View File

@@ -41,63 +41,64 @@
&cpufreq_hw {
qcom,thermal-pause {
compatible = "qcom,thermal-pause";
thermal_pause01: thermal-pause01 {
qcom,mask = <0x01>;
thermal_pause01: thermal-pause-0 {
qcom,cpus = <&CPU0>;
#cooling-cells = <2>;
};
thermal_pause02: thermal-pause02 {
qcom,mask = <0x02>;
thermal_pause02: thermal-pause-1 {
qcom,cpus = <&CPU1>;
#cooling-cells = <2>;
};
thermal_pause04: thermal-pause04 {
qcom,mask = <0x04>;
thermal_pause04: thermal-pause-2 {
qcom,cpus = <&CPU2>;
#cooling-cells = <2>;
};
thermal_pause08: thermal-pause08 {
qcom,mask = <0x08>;
thermal_pause08: thermal-pause-3 {
qcom,cpus = <&CPU3>;
#cooling-cells = <2>;
};
thermal_pause10: thermal-pause10 {
qcom,mask = <0x10>;
thermal_pause10: thermal-pause-4 {
qcom,cpus = <&CPU4>;
#cooling-cells = <2>;
};
thermal_pause20: thermal-pause20 {
qcom,mask = <0x20>;
thermal_pause20: thermal-pause-5 {
qcom,cpus = <&CPU5>;
#cooling-cells = <2>;
};
thermal_pause40: thermal-pause40 {
qcom,mask = <0x40>;
thermal_pause40: thermal-pause-6 {
qcom,cpus = <&CPU6>;
#cooling-cells = <2>;
};
thermal_pause80: thermal-pause80 {
qcom,mask = <0x80>;
thermal_pause80: thermal-pause-7 {
qcom,cpus = <&CPU7>;
#cooling-cells = <2>;
};
thermal_pause30: thermal-pause30 {
qcom,mask = <0x30>;
qcom,cpus = <&CPU4 &CPU5>;
#cooling-cells = <2>;
};
thermal_pauseC0: thermal-pauseC0 {
qcom,mask = <0xC0>;
qcom,cpus = <&CPU6 &CPU7>;
#cooling-cells = <2>;
};
thermal_pauseF0: thermal-pauseF0 {
qcom,mask = <0xF0>;
qcom,cpus = <&CPU4 &CPU5 &CPU6 &CPU7>;
#cooling-cells = <2>;
};
thermal_pauseFE: thermal-pauseFE {
qcom,mask = <0xFE>;
qcom,cpus =
<&CPU1 &CPU2 &CPU3 &CPU4 &CPU5 &CPU6 &CPU7>;
#cooling-cells = <2>;
};
};

55
qcom/pm8350b.dtsi
View File

@@ -224,7 +224,6 @@
pm8350b_temp_alarm: pm8350b_tz {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_tz>;
trips {
@@ -251,7 +250,6 @@
pm8350b-ibat-lvl0 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_bcl 0>;
trips {
@@ -266,7 +264,6 @@
pm8350b-ibat-lvl1 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_bcl 1>;
trips {
@@ -281,10 +278,21 @@
pm8350b-bcl-lvl0 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_bcl 5>;
trips {
thermal-engine-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
thermal-hal-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
b_bcl_lvl0: b-bcl-lvl0 {
temperature = <1>;
hysteresis = <1>;
@@ -296,10 +304,21 @@
pm8350b-bcl-lvl1 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_bcl 6>;
trips {
thermal-engine-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
thermal-hal-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
b_bcl_lvl1: b-bcl-lvl1 {
temperature = <1>;
hysteresis = <1>;
@@ -311,10 +330,21 @@
pm8350b-bcl-lvl2 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm8350b_bcl 7>;
trips {
thermal-engine-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
thermal-hal-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
b_bcl_lvl2: b-bcl-lvl2 {
temperature = <1>;
hysteresis = <1>;
@@ -326,10 +356,21 @@
socd {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&bcl_soc>;
trips {
thermal-engine-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
thermal-hal-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
socd_trip:socd-trip {
temperature = <90>;
hysteresis = <0>;

1
qcom/waipio-cdp.dtsi
View File

@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {

1
qcom/waipio-mtp.dtsi
View File

@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {

12
qcom/waipio-pmic-overlay.dtsi
View File

@@ -369,6 +369,18 @@
hysteresis = <1000>;
type = "passive";
};
xo_config0: xo-config0 {
temperature = <78000>;
hysteresis = <8000>;
type = "passive";
};
xo_config1: xo-config1 {
temperature = <80000>;
hysteresis = <10000>;
type = "passive";
};
};
};
};

1
qcom/waipio-qrd.dtsi
View File

@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "waipio-pmic-overlay.dtsi"
#include "waipio-thermal-overlay.dtsi"
#include "waipio-audio-overlay.dtsi"
&ufsphy_mem {

129
qcom/waipio-thermal-overlay.dtsi Normal file
View File

@@ -0,0 +1,129 @@
#include <dt-bindings/thermal/thermal_qti.h>
&thermal_zones {
socd {
cooling-maps {
socd_apc1 {
trip = <&socd_trip>;
cooling-device = <&APC1_pause 1 1>;
};
};
};
pm8350b-bcl-lvl0 {
cooling-maps {
vbat_cpu_4_5 {
trip = <&b_bcl_lvl0>;
cooling-device = <&cpu_4_5_pause 1 1>;
};
vbat_gpu0 {
trip = <&b_bcl_lvl0>;
cooling-device = <&msm_gpu 2 2>;
};
};
};
pm8350b-bcl-lvl1 {
cooling-maps {
vbat_cpu_6_7 {
trip = <&b_bcl_lvl1>;
cooling-device = <&cpu_6_7_pause 1 1>;
};
vbat_gpu1 {
trip = <&b_bcl_lvl1>;
cooling-device = <&msm_gpu 4 4>;
};
};
};
pm8350b-bcl-lvl2 {
cooling-maps {
vbat_gpu2 {
trip = <&b_bcl_lvl2>;
cooling-device = <&msm_gpu 7 THERMAL_NO_LIMIT>;
};
};
};
pm8350c-bcl-lvl0 {
cooling-maps {
vph_cpu_4_5 {
trip = <&c_bcl_lvl0>;
cooling-device = <&cpu_4_5_pause 1 1>;
};
vph_gpu0 {
trip = <&c_bcl_lvl0>;
cooling-device = <&msm_gpu 2 2>;
};
};
};
pm8350c-bcl-lvl1 {
cooling-maps {
vph_cpu_6_7 {
trip = <&c_bcl_lvl1>;
cooling-device = <&cpu_6_7_pause 1 1>;
};
vph_gpu1 {
trip = <&c_bcl_lvl1>;
cooling-device = <&msm_gpu 4 4>;
};
};
};
pm8350c-bcl-lvl2 {
cooling-maps {
vph_gpu2 {
trip = <&c_bcl_lvl2>;
cooling-device = <&msm_gpu 7 THERMAL_NO_LIMIT>;
};
};
};
pm8450_tz {
cooling-maps {
pm8450_cpu4_freq {
trip = <&pm8450_trip0>;
cooling-device = <&CPU4 15 THERMAL_NO_LIMIT>;
};
pm8450_cpu7_freq {
trip = <&pm8450_trip0>;
cooling-device = <&CPU7 15 THERMAL_NO_LIMIT>;
};
pm8450_apc1 {
trip = <&pm8450_trip0>;
cooling-device = <&APC1_pause 1 1>;
};
};
};
pm8350_tz {
cooling-maps {
pm8350_gpu {
trip = <&pm8350_trip0>;
cooling-device = <&msm_gpu 7 THERMAL_NO_LIMIT>;
};
pm8350_cpu4_freq {
trip = <&pm8350_trip0>;
cooling-device = <&CPU4 15 THERMAL_NO_LIMIT>;
};
pm8350_cpu7_freq {
trip = <&pm8350_trip0>;
cooling-device = <&CPU7 15 THERMAL_NO_LIMIT>;
};
pm8350_apc1 {
trip = <&pm8350_trip0>;
cooling-device = <&APC1_pause 1 1>;
};
};
};
};

354
qcom/waipio-thermal.dtsi
View File

@@ -1,3 +1,9 @@
#include <dt-bindings/thermal/thermal_qti.h>
&msm_gpu {
#cooling-cells = <2>;
};
&soc {
tsens0: thermal-sensor@c263000 {
compatible = "qcom,tsens-v2";
@@ -63,6 +69,21 @@
qcom,cpus = <&CPU7>;
#cooling-cells = <2>;
};
APC1_pause: apc1-pause {
qcom,cpus = <&CPU4 &CPU5 &CPU6 &CPU7>;
#cooling-cells = <2>;
};
cpu_4_5_pause: cpu-4-5-pause {
qcom,cpus = <&CPU4 &CPU5>;
#cooling-cells = <2>;
};
cpu_6_7_pause: cpu-6-7-pause {
qcom,cpus = <&CPU6 &CPU7>;
#cooling-cells = <2>;
};
};
qcom,cpu-hotplug {
@@ -240,11 +261,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu4_emerg0: cpu4-emerg0-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu10_cdev {
trip = <&cpu4_emerg0>;
cooling-device = <&cpu4_pause 1 1>;
};
};
};
@@ -259,11 +299,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu4_emerg1: cpu4-emerg1-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu11_cdev {
trip = <&cpu4_emerg1>;
cooling-device = <&cpu4_pause 1 1>;
};
};
};
@@ -278,11 +337,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu5_emerg0: cpu5-emerg0-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu12_cdev {
trip = <&cpu5_emerg0>;
cooling-device = <&cpu5_pause 1 1>;
};
};
};
@@ -297,11 +375,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu5_emerg1: cpu5-emerg1-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu13_cdev {
trip = <&cpu5_emerg1>;
cooling-device = <&cpu5_pause 1 1>;
};
};
};
@@ -316,11 +413,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu6_emerg0: cpu6-emerg0-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu14_cdev {
trip = <&cpu6_emerg0>;
cooling-device = <&cpu6_pause 1 1>;
};
};
};
@@ -335,11 +451,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu6_emerg1: cpu6-emerg1-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu15_cdev {
trip = <&cpu6_emerg1>;
cooling-device = <&cpu6_pause 1 1>;
};
};
};
@@ -354,11 +489,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu7_emerg0: cpu7-emerg0-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu16_cdev {
trip = <&cpu7_emerg0>;
cooling-device = <&cpu7_pause 1 1>;
};
};
};
@@ -373,11 +527,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu7_emerg1: cpu7-emerg1-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu17_cdev {
trip = <&cpu7_emerg1>;
cooling-device = <&cpu7_pause 1 1>;
};
};
};
@@ -392,16 +565,35 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu7_emerg2: cpu7-emerg2-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu18_cdev {
trip = <&cpu7_emerg2>;
cooling-device = <&cpu7_pause 1 1>;
};
};
};
gpuss-0 {
polling-delay-passive = <0>;
polling-delay-passive = <10>;
polling-delay = <0>;
thermal-sensors = <&tsens0 14>;
trips {
@@ -411,20 +603,7 @@
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
};
};
gpuss-1 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens0 15>;
trips {
thermal-engine-config {
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
@@ -435,6 +614,57 @@
hysteresis = <5000>;
type = "passive";
};
gpu0_tj_cfg: tj_cfg {
temperature = <95000>;
hysteresis = <0>;
type = "passive";
};
};
cooling-maps {
gpu0_cdev {
trip = <&gpu0_tj_cfg>;
cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
};
};
};
gpuss-1 {
polling-delay-passive = <10>;
polling-delay = <0>;
thermal-sensors = <&tsens0 15>;
trips {
thermal-engine-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
gpu1_tj_cfg: tj_cfg {
temperature = <95000>;
hysteresis = <0>;
type = "passive";
};
};
cooling-maps {
gpu1_cdev {
trip = <&gpu1_tj_cfg>;
cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
};
};
};
@@ -468,11 +698,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu0_emerg: cpu0-emerg-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu00_cdev {
trip = <&cpu0_emerg>;
cooling-device = <&cpu0_pause 1 1>;
};
};
};
@@ -487,11 +736,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu1_emerg: cpu1-emerg-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu01_cdev {
trip = <&cpu1_emerg>;
cooling-device = <&cpu1_pause 1 1>;
};
};
};
@@ -506,11 +774,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu2_emerg: cpu2-emerg-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu02_cdev {
trip = <&cpu2_emerg>;
cooling-device = <&cpu2_pause 1 1>;
};
};
};
@@ -525,11 +812,30 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
type = "passive";
};
cpu3_emerg: cpu3-emerg-cfg {
temperature = <110000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
cpu03_cdev {
trip = <&cpu3_emerg>;
cooling-device = <&cpu3_pause 1 1>;
};
};
};
@@ -544,6 +850,12 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
@@ -563,6 +875,12 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;
@@ -582,6 +900,12 @@
type = "passive";
};
thermal-hal-config {
temperature = <125000>;
hysteresis = <1000>;
type = "passive";
};
reset-mon-cfg {
temperature = <115000>;
hysteresis = <5000>;

2
qcom/waipio.dtsi
View File

@@ -3211,8 +3211,8 @@
#include "waipio-audio.dtsi"
#include "waipio-pcie.dtsi"
#include "msm-rdbg.dtsi"
#include "waipio-thermal.dtsi"
#include "waipio-gpu.dtsi"
#include "waipio-thermal.dtsi"
&pcie0_rp {
#address-cells = <5>;