[PATCH RFC v3 7/9] arm64: boot: dts: qcom: Use phandles for thermal_zones

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(-)

diff --git a/arch/arm64/boot/dts/qcom/pm8010.dtsi b/arch/arm64/boot/dts/qcom/pm8010.dtsi index 0ea641e12209..a889df2f2f25 100644 --- a/arch/arm64/boot/dts/qcom/pm8010.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8010.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550.dtsi b/arch/arm64/boot/dts/qcom/pm8550.dtsi index 797a18c249a4..cb5e70b28445 100644 --- a/arch/arm64/boot/dts/qcom/pm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550b.dtsi b/arch/arm64/boot/dts/qcom/pm8550b.dtsi index 72609f31c890..b3cfa030679a 100644 --- a/arch/arm64/boot/dts/qcom/pm8550b.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550b.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550ve.dtsi b/arch/arm64/boot/dts/qcom/pm8550ve.dtsi index 4dc1f03ab2c7..8ef57a51b5cd 100644 --- a/arch/arm64/boot/dts/qcom/pm8550ve.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550ve.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pm8550vs.dtsi b/arch/arm64/boot/dts/qcom/pm8550vs.dtsi index 97b1c18aa7d8..258526abcc21 100644 --- a/arch/arm64/boot/dts/qcom/pm8550vs.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8550vs.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi index 37daaefe3431..251a16424d84 100644 --- a/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi +++ b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi index 3b470f6ac46f..dbcfeb53d8ec 100644 --- a/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi +++ b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi @@ -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"; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index ee1ba5a8c8fc..c68e08747b6f 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -4452,7 +4452,7 @@ compute-cb@8 { }; };

- thermal-zones { + thermal_zones: thermal-zones { aoss0-thermal { polling-delay-passive = <0>; polling-delay = <0>; diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index 2df77123a8c7..32198bf3cf7c 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -5030,7 +5030,7 @@ compute-cb@8 { }; };

- thermal-zones { + thermal_zones: thermal-zones { aoss0-thermal { polling-delay-passive = <0>; polling-delay = <0>;