claude-noether
1d805ef70d
After verifying the minimal v7.0-rc3+pwm15+pwm-fan+RK806 baseline boots with display on ampere, extended via bisect-by-addition to include 3 more from linux-rk3588-marfrit's pre-cherry-pick set: 0004 enable speaker output (genbook dts + cm5 dtsi) 0005 USB-C PD charging (genbook dts: FUSB302, vcc5v0_otg) 0006 lid switch + USB3 lane mux (genbook dts: gpio-keys SW_LID, usbdp_phy1) ampere-minimal-devices branch on git.reauktion.de/marfrit/linux-rk3588-marfrit @ 7c241f2e2835 = the verified-working state with all 6 patches. Display continues to work — confirms regression source is in one of the 12 remaining linux-rk3588-marfrit commits (Shawn Lin pcie3 phy series, Cristian Ciocaltea clk/dts/dw-dp, Sebastian Reichel hdmirx, Pedro Alves btrtl, plus the WIP suspend/resume patch 0010). Generated-by: Claude Opus 4.7 <claude@reauktion.de>
115 lines
4.4 KiB
Diff
115 lines
4.4 KiB
Diff
From 3722eabbf2d28b1ea35add3e7b36d52e4bbd63c3 Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <mfritsche@localhost>
|
|
Date: Thu, 16 Apr 2026 23:52:54 +0200
|
|
Subject: [PATCH 4/6] arm64: dts: rockchip: rk3588-coolpi-cm5-genbook: enable
|
|
speaker output
|
|
|
|
The GenBook carrier board routes the ES8316 HPOL/HPOR outputs to both a
|
|
headphone jack and an external speaker amplifier. The amplifier is
|
|
enabled by GPIO1_A6 (active-high) and headphone insertion is detected by
|
|
GPIO1_B5 (active-high, pull-up).
|
|
|
|
Add a label to the shared analog-sound node in the CM5 DTSI so the
|
|
GenBook DTS can extend it, then override the node to:
|
|
|
|
- add pa-gpios for the speaker amplifier enable line (GPIO1_A6)
|
|
- add hp-det-gpios for headphone jack detection (GPIO1_B5)
|
|
- extend widgets/routing to include the Speaker path through the
|
|
audio-graph-card built-in "Amplifier" DAPM output-driver widget,
|
|
which gates the pa-gpios GPIO on widget power-up/down
|
|
- add the hp-det pinctrl group for GPIO1_B5
|
|
|
|
The "Amplifier" DAPM widget (snd_soc_dapm_out_drv) is provided by
|
|
audio-graph-card.c and registered at card level. Its event handler
|
|
drives pa-gpios high on SND_SOC_DAPM_POST_PMU and low on
|
|
SND_SOC_DAPM_PRE_PMD, giving automatic speaker enable/disable in step
|
|
with DAPM power management.
|
|
|
|
DAPM path for speaker output:
|
|
ES8316 AIF1RX (DAI) -> Left/Right DAC -> Left/Right Headphone Mixer
|
|
-> Left/Right Headphone Driver -> HPOL/HPOR [codec OUTPUT pins]
|
|
-> Amplifier [card OUT_DRV, fires pa-gpios] -> Speaker [SPK terminal]
|
|
|
|
The Left/Right Headphone Mixer Left/Right DAC Switch controls, which
|
|
gate the DAC-to-mixer connections in the DAPM graph, are set on by the
|
|
UCM BootSequence in the rk3588-es8316 ALSA UCM profile and must remain
|
|
enabled for the path to be traversable.
|
|
|
|
The HPOL/HPOR codec output pins also feed the Headphones HP widget:
|
|
|
|
HPOL/HPOR -> Headphones [HP terminal, jack-controlled via hp-det-gpios]
|
|
|
|
Both the Speaker and Headphones paths are active whenever a PCM stream
|
|
is running. Speaker-muting when headphones are inserted is handled at
|
|
the userspace (UCM) level via JackHWMute on the Speaker UCM device: when
|
|
PipeWire routes audio away from the Speaker sink on headphone insertion,
|
|
the absence of an active PCM consumer causes DAPM to power down the
|
|
Amplifier widget and drive GPIO1_A6 low.
|
|
|
|
Note: full speaker output also requires a Speaker SectionDevice in the
|
|
rk3588-es8316 ALSA UCM HiFi.conf. Without it the HiFi profile's only
|
|
playback port is Headphones (jack-controlled), causing the profile to be
|
|
reported as "not available" when no headphones are inserted, and
|
|
PipeWire falls back to the pro-audio profile with no speaker sub-device.
|
|
A separate patch to alsa-ucm-conf adds the missing Speaker device.
|
|
|
|
Generated-by: Claude Sonnet 4.6 <noreply@anthropic.com>
|
|
Signed-off-by: Markus Fritsche <mfritsche@reauktion.de>
|
|
---
|
|
.../rockchip/rk3588-coolpi-cm5-genbook.dts | 24 +++++++++++++++++++
|
|
.../boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 2 +-
|
|
2 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
|
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 9819ac482855..070f5dde715c 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
|
|
@@ -283,7 +283,31 @@ &pcie3x4 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&analog_sound {
|
|
+ pa-gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
|
|
+ hp-det-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&hp_det>;
|
|
+
|
|
+ widgets = "Microphone", "Mic Jack",
|
|
+ "Headphone", "Headphones",
|
|
+ "Speaker", "Speaker";
|
|
+
|
|
+ routing = "MIC2", "Mic Jack",
|
|
+ "Headphones", "HPOL",
|
|
+ "Headphones", "HPOR",
|
|
+ "Amplifier", "HPOL",
|
|
+ "Amplifier", "HPOR",
|
|
+ "Speaker", "Amplifier";
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
+ headphone {
|
|
+ hp_det: hp-det {
|
|
+ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
+ };
|
|
+ };
|
|
+
|
|
lcd {
|
|
lcdpwr_en: lcdpwr-en {
|
|
rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
|
|
index 83b72ec95f5a..582c3717192f 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
|
|
@@ -21,7 +21,7 @@ aliases {
|
|
serial2 = &uart2;
|
|
};
|
|
|
|
- analog-sound {
|
|
+ analog_sound: analog-sound {
|
|
compatible = "audio-graph-card";
|
|
dais = <&i2s0_8ch_p0>;
|
|
label = "rk3588-es8316";
|
|
--
|
|
2.54.0
|
|
|