claude-noether
91617fae14
Closes the migration started in #8. The 6 active ampere patches (pwm15, pwm-fan, RK806 power-controller, speaker, USB-C PD, lid switch) landed in #8 under soc/rockchip/rk3588/, module/coolpi-cm5/, and board/coolpi-cm5-genbook/. This commit migrates the remaining 3: * `0006 arm64 Kconfig: do not select HAVE_GCC_PLUGINS` → patches/arch/arm64/. NOT for upstream — local build workaround; README explains the proper fix is gcc-plugin-devel install. * `0009 Bluetooth: btrtl: make RTL_SEC_PROJ read non-fatal` → patches/driver/bluetooth/btrtl/. Benefits ampere (RTL8852BE) and boltzmann (same M.2 family). Cross-host driver/ scope. * `0010 gpio/drm/mfd/input/dts: fix suspend/resume and wakeup on RK3588` → SPLIT into 5 scope-tagged sub-patches as the issue required ("0010 split into ≥2 patches by scope"): - patches/driver/gpio/rockchip/0010a-gpio-rockchip-propagate-irq_set_wake-to-parent-GIC.patch - patches/driver/gpu/drm/bridge/analogix/0010b-drm-bridge-analogix-dp-disable-IRQ-before-clock-gating-in-suspend.patch - patches/driver/mfd/rk8xx/0010c-mfd-rk8xx-spi-add-PM-ops-and-shutdown-callback.patch - patches/driver/input/misc/0010d-input-rk805-pwrkey-register-wake-IRQ-via-dev_pm_set_wake_irq.patch - patches/board/coolpi-cm5-genbook/0010e-arm64-dts-rockchip-rk3588-coolpi-cm5-genbook-add-NPU-power-domain-and-touchpad-wakeup.patch The split is byte-identical to the original 0010 (verified on decompose-0010 branch in marfrit/linux-rk3588-marfrit — sha256 of the combined diff matches the monolithic 0010 commit). All 0010 sub-patches marked WIP in their README and explicitly NOT added to fleet/ampere.yaml includes — suspend/resume thread is still open and Markus hasn't decided the upstream-targeting shape. READMEs added at each new directory documenting per-patch context. Acceptance criteria from #1: [x] Each patch lives at narrowest correct scope [x] 0010 split into ≥2 patches by scope (5 sub-patches) [x] Per-host manifest for ampere references the right scopes + explicit includes (already #8) [ ] github.com/marfrit/misc_patches retained as historical mirror — Markus to decide [x] working-tree dirty state on boltzmann reconciled (decompose-0010 + ampere-minimal-devices branches captured) Generated-by: Claude Opus 4.7 <claude@reauktion.de>
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 0aa15733f32277939a0523276bec8f092a67e28c Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <mfritsche@localhost>
|
|
Date: Thu, 16 Apr 2026 23:53:05 +0200
|
|
Subject: [PATCH 5/9] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: add NPU
|
|
power-domain link and touchpad wakeup-source
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- i2c-hid touchpad: add wakeup-source so the PM core arms the IRQ
|
|
- Add NPU power domain (matching Rock 5B+ which has working suspend),
|
|
required for proper power-down sequencing.
|
|
|
|
Note: this DTS hunk is the suspect for breaking cold-boot eDP probe on
|
|
ampere (panel-edp WARN_ON + Fixed dependency cycle between /edp@fded0000
|
|
and panel) — kept as its own commit so it can be reverted in isolation
|
|
without losing the suspend/resume PM fixes.
|
|
|
|
Generated-by: Claude Opus 4.6 <noreply@anthropic.com>
|
|
Signed-off-by: Markus Fritsche <mfritsche@localhost>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 5 +++++
|
|
1 file changed, 5 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 e3954851b0cb..cabfb380fe27 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
@@ -340,6 +340,7 @@ touchpad: touchpad@2c {
|
|
interrupt-parent = <&gpio1>;
|
|
interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
|
|
hid-descr-addr = <0x0020>;
|
|
+ wakeup-source;
|
|
};
|
|
};
|
|
|
|
@@ -455,6 +456,10 @@ mh248_irq_gpio: mh248-irq-gpio {
|
|
};
|
|
};
|
|
|
|
+&pd_npu {
|
|
+ domain-supply = <&vdd_npu_s0>;
|
|
+};
|
|
+
|
|
&pwm6 {
|
|
pinctrl-0 = <&pwm6m1_pins>;
|
|
status = "okay";
|
|
--
|
|
2.54.0
|
|
|