* [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node
@ 2022-12-27 17:02 Johan Hovold
2022-12-27 17:03 ` Konrad Dybcio
2022-12-28 4:36 ` Bjorn Andersson
0 siblings, 2 replies; 3+ messages in thread
From: Johan Hovold @ 2022-12-27 17:02 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Andy Gross, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Manivannan Sadhasivam, linux-arm-msm, devicetree, linux-kernel,
Johan Hovold
Move the 'thermal-zones' node after the regulator nodes to restore the
root-node sort order (alphabetically by node name).
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 92 +++++++++----------
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 568c6be1ceaa..fce2d9d6e2bc 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -31,52 +31,6 @@ backlight {
pinctrl-0 = <&edp_bl_en>, <&edp_bl_pwm>;
};
- thermal-zones {
- skin-temp-thermal {
- polling-delay-passive = <250>;
- polling-delay = <0>;
- thermal-sensors = <&pmk8280_adc_tm 5>;
-
- trips {
- skin_temp_alert0: trip-point0 {
- temperature = <55000>;
- hysteresis = <1000>;
- type = "passive";
- };
-
- skin_temp_alert1: trip-point1 {
- temperature = <58000>;
- hysteresis = <1000>;
- type = "passive";
- };
-
- skin-temp-crit {
- temperature = <73000>;
- hysteresis = <1000>;
- type = "critical";
- };
- };
-
- cooling-maps {
- map0 {
- trip = <&skin_temp_alert0>;
- cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
- };
-
- map1 {
- trip = <&skin_temp_alert1>;
- cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
- <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
- };
- };
- };
- };
-
gpio-keys {
compatible = "gpio-keys";
@@ -172,6 +126,52 @@ vreg_wwan: regulator-wwan {
regulator-boot-on;
};
+
+ thermal-zones {
+ skin-temp-thermal {
+ polling-delay-passive = <250>;
+ polling-delay = <0>;
+ thermal-sensors = <&pmk8280_adc_tm 5>;
+
+ trips {
+ skin_temp_alert0: trip-point0 {
+ temperature = <55000>;
+ hysteresis = <1000>;
+ type = "passive";
+ };
+
+ skin_temp_alert1: trip-point1 {
+ temperature = <58000>;
+ hysteresis = <1000>;
+ type = "passive";
+ };
+
+ skin-temp-crit {
+ temperature = <73000>;
+ hysteresis = <1000>;
+ type = "critical";
+ };
+ };
+
+ cooling-maps {
+ map0 {
+ trip = <&skin_temp_alert0>;
+ cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ };
+
+ map1 {
+ trip = <&skin_temp_alert1>;
+ cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+ <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ };
+ };
+ };
+ };
};
&apps_rsc {
--
2.37.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node
2022-12-27 17:02 [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node Johan Hovold
@ 2022-12-27 17:03 ` Konrad Dybcio
2022-12-28 4:36 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Konrad Dybcio @ 2022-12-27 17:03 UTC (permalink / raw)
To: Johan Hovold, Bjorn Andersson
Cc: Andy Gross, Rob Herring, Krzysztof Kozlowski,
Manivannan Sadhasivam, linux-arm-msm, devicetree, linux-kernel
On 27.12.2022 18:02, Johan Hovold wrote:
> Move the 'thermal-zones' node after the regulator nodes to restore the
> root-node sort order (alphabetically by node name).
>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 92 +++++++++----------
> 1 file changed, 46 insertions(+), 46 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index 568c6be1ceaa..fce2d9d6e2bc 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -31,52 +31,6 @@ backlight {
> pinctrl-0 = <&edp_bl_en>, <&edp_bl_pwm>;
> };
>
> - thermal-zones {
> - skin-temp-thermal {
> - polling-delay-passive = <250>;
> - polling-delay = <0>;
> - thermal-sensors = <&pmk8280_adc_tm 5>;
> -
> - trips {
> - skin_temp_alert0: trip-point0 {
> - temperature = <55000>;
> - hysteresis = <1000>;
> - type = "passive";
> - };
> -
> - skin_temp_alert1: trip-point1 {
> - temperature = <58000>;
> - hysteresis = <1000>;
> - type = "passive";
> - };
> -
> - skin-temp-crit {
> - temperature = <73000>;
> - hysteresis = <1000>;
> - type = "critical";
> - };
> - };
> -
> - cooling-maps {
> - map0 {
> - trip = <&skin_temp_alert0>;
> - cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> - };
> -
> - map1 {
> - trip = <&skin_temp_alert1>;
> - cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> - <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> - };
> - };
> - };
> - };
> -
> gpio-keys {
> compatible = "gpio-keys";
>
> @@ -172,6 +126,52 @@ vreg_wwan: regulator-wwan {
>
> regulator-boot-on;
> };
> +
> + thermal-zones {
> + skin-temp-thermal {
> + polling-delay-passive = <250>;
> + polling-delay = <0>;
> + thermal-sensors = <&pmk8280_adc_tm 5>;
> +
> + trips {
> + skin_temp_alert0: trip-point0 {
> + temperature = <55000>;
> + hysteresis = <1000>;
> + type = "passive";
> + };
> +
> + skin_temp_alert1: trip-point1 {
> + temperature = <58000>;
> + hysteresis = <1000>;
> + type = "passive";
> + };
> +
> + skin-temp-crit {
> + temperature = <73000>;
> + hysteresis = <1000>;
> + type = "critical";
> + };
> + };
> +
> + cooling-maps {
> + map0 {
> + trip = <&skin_temp_alert0>;
> + cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> +
> + map1 {
> + trip = <&skin_temp_alert1>;
> + cooling-device = <&CPU4 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU5 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU6 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> + <&CPU7 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> + };
> + };
> + };
> };
>
> &apps_rsc {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node
2022-12-27 17:02 [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node Johan Hovold
2022-12-27 17:03 ` Konrad Dybcio
@ 2022-12-28 4:36 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2022-12-28 4:36 UTC (permalink / raw)
To: johan+linaro
Cc: Manivannan Sadhasivam, krzysztof.kozlowski+dt, konrad.dybcio,
linux-kernel, agross, devicetree, robh+dt, linux-arm-msm
On Tue, 27 Dec 2022 18:02:02 +0100, Johan Hovold wrote:
> Move the 'thermal-zones' node after the regulator nodes to restore the
> root-node sort order (alphabetically by node name).
>
>
Applied, thanks!
[1/1] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node
commit: 5e4cab734c26ec46fd847bedd31a0df83d853b04
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-28 4:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-27 17:02 [PATCH] arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node Johan Hovold
2022-12-27 17:03 ` Konrad Dybcio
2022-12-28 4:36 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox