Skip to content

Commit 5449cab

Browse files
committed
Merge tag 'juno-fix-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
Armv8 Juno fix for v6.1 Just a single fix to add the missing critical points in the thermal zones that has been mandatory in the binding but was enforced in the code recently. * tag 'juno-fix-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: Add thermal critical trip points Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f76c745 + c4a7b9b commit 5449cab

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

arch/arm64/boot/dts/arm/juno-base.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,26 @@
751751
polling-delay = <1000>;
752752
polling-delay-passive = <100>;
753753
thermal-sensors = <&scpi_sensors0 0>;
754+
trips {
755+
pmic_crit0: trip0 {
756+
temperature = <90000>;
757+
hysteresis = <2000>;
758+
type = "critical";
759+
};
760+
};
754761
};
755762

756763
soc {
757764
polling-delay = <1000>;
758765
polling-delay-passive = <100>;
759766
thermal-sensors = <&scpi_sensors0 3>;
767+
trips {
768+
soc_crit0: trip0 {
769+
temperature = <80000>;
770+
hysteresis = <2000>;
771+
type = "critical";
772+
};
773+
};
760774
};
761775

762776
big_cluster_thermal_zone: big-cluster {

0 commit comments

Comments
 (0)