eb7268a581
Adds fleet/ampere.yaml manifest and 3 scope-tagged patches in
patches/board/coolpi-genbook/ for the linux-ampere-fourier kernel.
Baseline: mainline v7.0-rc3. Patch set is the verified-working
minimum after a 2026-05-16 bisect campaign:
0001 pwm15 pinctrl entries (rk3588 SoC dtsi)
0002 pwm-fan + thermal cooling cells (genbook dts)
0003 RK806 system-power-controller (cm5 module dtsi)
NOT included (intentionally):
- misc_patches/genbook/kernel/0010 family — suspend/resume +
wakeup WIP, leave out until Markus closes the thread
- 8 cherry-picks (Shawn Lin pcie3 phy, Cristian Ciocaltea
clk+dw-dp, Sebastian Reichel hdmirx, Pedro Alves) plus the
DTS commits (lid switch, USB-C PD, speaker) — one or more
of these black-screens ampere; offender not yet bisected
The linux-rk3588-marfrit branch tip (f8f3ad9, 18 commits ahead
of v7.0-rc3) produced a display regression on ampere
(connector/dpms/SDDM all positive software-side, panel actually
blank). Decomposing patch 0010 into 5 atomic sub-commits and
reverting all 5 (= test-arch-plus-pcie3 branch on
git.reauktion.de/marfrit/linux-rk3588-marfrit) did NOT fix the
regression, ruling out 0010. The ampere-minimal branch
(v7.0-rc3 + only the 3 patches above) boots clean with display
on ampere — confirming the offender is one of the 14 patches
left out here.
ampere-minimal branch on git.reauktion.de/marfrit/linux-rk3588-marfrit
@ 0ce6ef5d48f2 is the working baseline.
Generated-by: Claude Opus 4.7 <claude@reauktion.de>
82 lines
2.1 KiB
Diff
82 lines
2.1 KiB
Diff
From ed8fd7da66575a255c34d70b1ded0eb917ae0a80 Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <mfritsche@localhost>
|
|
Date: Thu, 16 Apr 2026 23:52:53 +0200
|
|
Subject: [PATCH 2/3] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: Add
|
|
pwm-fan with thermal cooling
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The CoolPi CM5 GenBook has a PWM-controlled fan connected to pwm15
|
|
(mux m3, GPIO1_D7). Add a pwm-fan node driven at 20 kHz (50000 ns
|
|
period) with six cooling levels, and wire it into the package thermal
|
|
zone with two trip points at 55 °C and 65 °C.
|
|
|
|
Generated-by: Claude Sonnet 4.6 <noreply@anthropic.com>
|
|
Signed-off-by: Markus Fritsche <mfritsche@reauktion.de>
|
|
---
|
|
.../rockchip/rk3588-coolpi-cm5-genbook.dts | 43 +++++++++++++++++++
|
|
1 file changed, 43 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
index 738637ecaf55..9819ac482855 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
@@ -23,6 +23,13 @@ backlight: backlight {
|
|
pwms = <&pwm6 0 25000 0>;
|
|
};
|
|
|
|
+ fan: pwm-fan {
|
|
+ compatible = "pwm-fan";
|
|
+ #cooling-cells = <2>;
|
|
+ pwms = <&pwm15 0 50000 0>;
|
|
+ cooling-levels = <1 50 100 150 200 254>;
|
|
+ };
|
|
+
|
|
battery: battery {
|
|
compatible = "simple-battery";
|
|
charge-full-design-microamp-hours = <9800000>;
|
|
@@ -443,3 +450,39 @@ vp2_out_edp1: endpoint@ROCKCHIP_VOP2_EP_EDP1 {
|
|
remote-endpoint = <&edp1_in_vp2>;
|
|
};
|
|
};
|
|
+
|
|
+&package_thermal {
|
|
+ polling-delay = <1000>;
|
|
+
|
|
+ trips {
|
|
+ package_fan0: package-fan0 {
|
|
+ temperature = <55000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "active";
|
|
+ };
|
|
+
|
|
+ package_fan1: package-fan1 {
|
|
+ temperature = <65000>;
|
|
+ hysteresis = <2000>;
|
|
+ type = "active";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ cooling-maps {
|
|
+ map0 {
|
|
+ trip = <&package_fan0>;
|
|
+ cooling-device = <&fan THERMAL_NO_LIMIT 2>;
|
|
+ };
|
|
+
|
|
+ map1 {
|
|
+ trip = <&package_fan1>;
|
|
+ cooling-device = <&fan 3 THERMAL_NO_LIMIT>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
+&pwm15 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pwm15m3_pins>;
|
|
+ status = "okay";
|
|
+};
|
|
--
|
|
2.54.0
|
|
|