| Message ID | 20221227170202.21618-1-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 5e4cab734c26ec46fd847bedd31a0df83d853b04 |
| Headers | show |
| Series | arm64: dts: qcom: sc8280xp-x13s: move 'thermal-zones' node | expand |
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 {
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,
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 {
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(-)