@@ -6,47 +6,45 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pm8010-m-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+&thermal_zones {
+ pm8010-m-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8010_m_temp_alarm>;
+ thermal-sensors = <&pm8010_m_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
+ };
- pm8010-n-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+ pm8010-n-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8010_n_temp_alarm>;
+ thermal-sensors = <&pm8010_n_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,26 +6,24 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pm8550-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+&thermal_zones {
+ pm8550-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8550_temp_alarm>;
+ thermal-sensors = <&pm8550_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,26 +6,24 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pm8550b-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
-
- thermal-sensors = <&pm8550b_temp_alarm>;
-
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+&thermal_zones {
+ pm8550b-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+
+ thermal-sensors = <&pm8550b_temp_alarm>;
+
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,26 +6,24 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pm8550ve-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
-
- thermal-sensors = <&pm8550ve_temp_alarm>;
-
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
-
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+&thermal_zones {
+ pm8550ve-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+
+ thermal-sensors = <&pm8550ve_temp_alarm>;
+
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,89 +6,87 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pm8550vs-c-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
-
- thermal-sensors = <&pm8550vs_c_temp_alarm>;
-
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
-
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+&thermal_zones {
+ pm8550vs-c-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+
+ thermal-sensors = <&pm8550vs_c_temp_alarm>;
+
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
+ };
- pm8550vs-d-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+ pm8550vs-d-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8550vs_d_temp_alarm>;
+ thermal-sensors = <&pm8550vs_d_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
+ };
- pm8550vs-e-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+ pm8550vs-e-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8550vs_e_temp_alarm>;
+ thermal-sensors = <&pm8550vs_e_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
+ };
- pm8550vs-g-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
+ pm8550vs-g-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
- thermal-sensors = <&pm8550vs_g_temp_alarm>;
+ thermal-sensors = <&pm8550vs_g_temp_alarm>;
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,26 +6,24 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pmr735d-k-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
-
- thermal-sensors = <&pmr735d_k_temp_alarm>;
-
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
-
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+&thermal_zones {
+ pmr735d-k-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+
+ thermal-sensors = <&pmr735d_k_temp_alarm>;
+
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -6,26 +6,24 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
-/ {
- thermal-zones {
- pmr735d-l-thermal {
- polling-delay-passive = <100>;
- polling-delay = <0>;
-
- thermal-sensors = <&pmr735d_l_temp_alarm>;
-
- trips {
- trip0 {
- temperature = <95000>;
- hysteresis = <0>;
- type = "passive";
- };
-
- trip1 {
- temperature = <115000>;
- hysteresis = <0>;
- type = "hot";
- };
+&thermal_zones {
+ pmr735d-l-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+
+ thermal-sensors = <&pmr735d_l_temp_alarm>;
+
+ trips {
+ trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ trip1 {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "hot";
};
};
};
@@ -4452,7 +4452,7 @@ compute-cb@8 {
};
};
- thermal-zones {
+ thermal_zones: thermal-zones {
aoss0-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
@@ -5030,7 +5030,7 @@ compute-cb@8 {
};
};
- thermal-zones {
+ thermal_zones: thermal-zones {
aoss0-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
In preparation for converting sm8550 to use devicetree overlays, use phandles for thermal_zones. Signed-off-by: Elliot Berman <quic_eberman@quicinc.com> --- arch/arm64/boot/dts/qcom/pm8010.dtsi | 62 ++++++++-------- arch/arm64/boot/dts/qcom/pm8550.dtsi | 32 ++++---- arch/arm64/boot/dts/qcom/pm8550b.dtsi | 36 +++++---- arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 128 ++++++++++++++++---------------- arch/arm64/boot/dts/qcom/pmr735d_a.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/pmr735d_b.dtsi | 38 +++++----- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +- 9 files changed, 181 insertions(+), 195 deletions(-)