From: Yaozhong Li <yaozhonguwl@gmail.com>
To: heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 0/3] arm64: dts: rockchip: fix audio on Firefly-RK3399
Date: Mon, 21 Sep 2026 14:34:27 +0800 [thread overview]
Message-ID: <20260921063431.103-1-yaozhonguwl@gmail.com> (raw)
This supersedes my earlier two-patch series [1].
Patch 1/2 there dropped the &i2s0 override outright. That is wrong: the
i2s0 pin groups also list GPIO4_A0, which carries SCLK_I2S_8CH_OUT, the
codec MCLK. Dropping the override unmuxes that pin and leaves analog
audio dead. I have asked for that series to be dropped. The HDMI patch
depended on it, so it is not resent on its own but as 3/3 here.
1/3 is independent of the other two and fixes a separate bug: the GPIO
that gates the headphone output is muxed by the board file but never
claimed or driven, so the jack has never worked with a mainline kernel.
2/3 and 3/3 have to stay in this order; 3/3 needs the pl330 channels
that 2/3 frees.
Changes in v2:
- 1/3 is new: model the headphone output enable GPIO as a
simple-audio-amplifier aux device, the way rk3399-roc-pc-plus.dts
does.
- 2/3 replaces the old 1/2. It now splits GPIO4_A0 into its own pinctrl
group and gives it to i2s1 before disabling i2s0, instead of just
removing the override.
- 3/3 is the old 2/2, unchanged apart from the commit message.
Tested on a Firefly-RK3399 running 6.18. What was not done: the patched
tree was not built as a full kernel, and the DTS was compiled and the
resulting DTB inspected instead; the changes were exercised on the board
through an equivalent DTB rather than a kernel built from this tree. I
have no schematic for the board, so 1/3 relies on measurement rather
than on knowing what the GPIO switches.
[1] https://lore.kernel.org/all/20260903082713.192-1-yaozhonguwl@gmail.com/
Yaozhong Li (3):
arm64: dts: rockchip: fix analog headphone output on rk3399-firefly
arm64: dts: rockchip: disable unused i2s0 on rk3399-firefly
arm64: dts: rockchip: enable HDMI audio on rk3399-firefly
.../boot/dts/rockchip/rk3399-firefly.dts | 36 +++++++++++++------
1 file changed, 26 insertions(+), 10 deletions(-)
--
2.55.0.windows.3
next reply other threads:[~2026-09-21 6:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 6:34 Yaozhong Li [this message]
2026-09-21 6:34 ` [PATCH v2 1/3] arm64: dts: rockchip: fix analog headphone output on rk3399-firefly Yaozhong Li
2026-09-21 6:34 ` [PATCH v2 2/3] arm64: dts: rockchip: disable unused i2s0 " Yaozhong Li
2026-09-21 6:34 ` [PATCH v2 3/3] arm64: dts: rockchip: enable HDMI audio " Yaozhong Li
2026-10-04 21:17 ` [PATCH v2 0/3] arm64: dts: rockchip: fix audio on Firefly-RK3399 Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260921063431.103-1-yaozhonguwl@gmail.com \
--to=yaozhonguwl@gmail.com \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox