10a4710248
To make HDMI CEC work, we have to compile MESON_DRM as a module (see #1717). However, this essentially reverts #1347, which fixed the reboot problem by compiling the driver into the kernel. Hence we need to reintroduce the earlier fix from #1345, which reverts the offending commit causing the reboot problem.
75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
From f1120f132dbdf2e7f7acf328de55bbdce877d882 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f1120f132dbdf2e7f7acf328de55bbdce877d882.1642331593.git.stefan@agner.ch>
|
|
In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Mon, 11 Jan 2021 15:53:55 +0100
|
|
Subject: [PATCH 06/10] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
|
|
device
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Add the GPIO fan as a cooling device for the CPU thermal zone. Since we
|
|
have only full fan speed available with this, set the tripping point to
|
|
65°C which is the highest tripping point which Hardkernel used in their
|
|
downstream kernel.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
.../dts/amlogic/meson-g12b-odroid-n2.dtsi | 38 +++++++++++++++++++
|
|
1 file changed, 38 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
index e8a3ede698b5..dd345c6aa4b5 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
@@ -388,6 +388,44 @@ &clkc_audio {
|
|
status = "okay";
|
|
};
|
|
|
|
+&cpu_thermal {
|
|
+ trips {
|
|
+ cpu_warm: cpu_warm {
|
|
+ hysteresis = <5000>;
|
|
+ temperature = <65000>;
|
|
+ type = "active";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ cooling-maps {
|
|
+ map0 {
|
|
+ cooling-device =
|
|
+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ trip = <&cpu_warm>;
|
|
+ };
|
|
+ map1 {
|
|
+ trip = <&cpu_passive>;
|
|
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ };
|
|
+ map2 {
|
|
+ trip = <&cpu_hot>;
|
|
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
|
+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&cpu0 {
|
|
cpu-supply = <&vddcpu_b>;
|
|
operating-points-v2 = <&cpu_opp_table_0>;
|
|
--
|
|
2.34.1
|
|
|