| Message ID | 20230820153135.42588-3-linux@fw-web.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mt7986 DTS fixes | expand |
Il 20/08/23 17:31, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > Add Critical and hot trips for emergency system shutdown and limiting > system load. > > Change passive trip to active to make sure fan is activated on the > lowest trip. > > Fixes: 1f5be05132f3 ("arm64: dts: mt7986: add thermal-zones") > Suggested-by: Daniel Golle <daniel@makrotopia.org> > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > index 207510abda89..36d8945400df 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > @@ -614,22 +614,34 @@ cpu_thermal: cpu-thermal { > thermal-sensors = <&thermal 0>; > > trips { > + cpu_trip_crit: crit { > + temperature = <125000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + > + cpu_trip_hot: hot { > + temperature = <120000>; > + hysteresis = <2000>; > + type = "hot"; > + }; > + > cpu_trip_active_high: active-high { > temperature = <115000>; > hysteresis = <2000>; > type = "active"; > }; > > - cpu_trip_active_low: active-low { > + cpu_trip_active_med: active-med { > temperature = <85000>; > hysteresis = <2000>; > type = "active"; > }; > > - cpu_trip_passive: passive { Rule of thumb is that each commit has to build on its own: this will break build because of mt7986a-bananapi-bpi-r3.dts referencing the now unexistant cpu_trip_passive phandle. Solving that is simple. Merge commit [2/3] and [3/3] in a single commit. Obviously, retain both fixes tags :-) Cheers, Angelo
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi index 207510abda89..36d8945400df 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi @@ -614,22 +614,34 @@ cpu_thermal: cpu-thermal { thermal-sensors = <&thermal 0>; trips { + cpu_trip_crit: crit { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; + }; + + cpu_trip_hot: hot { + temperature = <120000>; + hysteresis = <2000>; + type = "hot"; + }; + cpu_trip_active_high: active-high { temperature = <115000>; hysteresis = <2000>; type = "active"; }; - cpu_trip_active_low: active-low { + cpu_trip_active_med: active-med { temperature = <85000>; hysteresis = <2000>; type = "active"; }; - cpu_trip_passive: passive { - temperature = <40000>; + cpu_trip_active_low: active-low { + temperature = <60000>; hysteresis = <2000>; - type = "passive"; + type = "active"; }; }; };