Linux kernel -stable discussions
 help / color / mirror / Atom feed
* [PATCH 1/3] arm64: dts: rockchip: Fix rk3399-roc-pc-plus analog audio
@ 2026-07-17  1:07 Fabio Estevam
  2026-07-29 15:59 ` Heiko Stuebner
  0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2026-07-17  1:07 UTC (permalink / raw)
  To: heiko
  Cc: robh, krzk+dt, conor+dt, devicetree, linux-arm-kernel,
	linux-rockchip, Fabio Estevam, stable

From: Fabio Estevam <festevam@nabladev.com>

The ES8388 sound card on the rk3399-roc-pc-plus fails to probe because
i2s1 cannot claim its MCLK pin:

pinctrl: pin gpio4-0 already requested by ff880000.i2s; cannot claim for ff890000.i2s
pinctrl: error -EINVAL: pin-128 (ff890000.i2s)
pinctrl: error -EINVAL: could not request pin 128 (gpio4-0) from group i2s-8ch-mclk-pin
on device rockchip-pinctrl

GPIO4_A0 is routed as SCLK_I2S_8CH_OUT and is used by i2s1 as the
external MCLK for the ES8388 codec. The board dts already removes
GPIO4_A0 from the i2s0_8ch_bus pin group, but i2s0 still claims the
same pin through its bclk_off state.

Since the i2s driver requests both states, this blocks i2s1 pinctrl
setup and leaves the simple-audio-card deferred with a parse error.

Override i2s0_8ch_bus_bclk_off as well, matching the existing
i2s0_8ch_bus override, so GPIO4_A0 is left for i2s1/ES8388 audio.

Cc: stable@vger.kernel.org
Fixes: 6d9a7bd6a13c ("arm64: dts: rockchip: add support for Firefly ROC-RK3399-PC-PLUS")
Signed-off-by: Fabio Estevam <festevam@nabladev.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
index 4f2831097624..f6d62ee51f1b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
@@ -136,6 +136,18 @@ &i2s0_8ch_bus {
 		<3 RK_PD7 1 &pcfg_pull_none>;
 };
 
+&i2s0_8ch_bus_bclk_off {
+	rockchip,pins =
+		<3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
+		<3 RK_PD1 1 &pcfg_pull_none>,
+		<3 RK_PD2 1 &pcfg_pull_none>,
+		<3 RK_PD3 1 &pcfg_pull_none>,
+		<3 RK_PD4 1 &pcfg_pull_none>,
+		<3 RK_PD5 1 &pcfg_pull_none>,
+		<3 RK_PD6 1 &pcfg_pull_none>,
+		<3 RK_PD7 1 &pcfg_pull_none>;
+};
+
 &i2s1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2s_8ch_mclk_pin>, <&i2s1_2ch_bus>;
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/3] arm64: dts: rockchip: Fix rk3399-roc-pc-plus analog audio
  2026-07-17  1:07 [PATCH 1/3] arm64: dts: rockchip: Fix rk3399-roc-pc-plus analog audio Fabio Estevam
@ 2026-07-29 15:59 ` Heiko Stuebner
  0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2026-07-29 15:59 UTC (permalink / raw)
  To: Fabio Estevam
  Cc: Heiko Stuebner, robh, krzk+dt, conor+dt, devicetree,
	linux-arm-kernel, linux-rockchip, Fabio Estevam, stable


On Thu, 16 Jul 2026 22:07:34 -0300, Fabio Estevam wrote:
> The ES8388 sound card on the rk3399-roc-pc-plus fails to probe because
> i2s1 cannot claim its MCLK pin:
> 
> pinctrl: pin gpio4-0 already requested by ff880000.i2s; cannot claim for ff890000.i2s
> pinctrl: error -EINVAL: pin-128 (ff890000.i2s)
> pinctrl: error -EINVAL: could not request pin 128 (gpio4-0) from group i2s-8ch-mclk-pin
> on device rockchip-pinctrl
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: rockchip: Fix rk3399-roc-pc-plus analog audio
      commit: 4f7259ebe1eba4778768a4f5a0bbbe439d10f3f3
[2/3] arm64: dts: rockchip: Enable wireless on rk3399-roc-pc-plus
      commit: 2dfc88c13fb2db7f17c55f16b679cdfe4ded19c5
[3/3] arm64: dts: rockchip: Keep rk3399-roc-pc-plus work LED on
      commit: b2007873ddfff223bb680c7ff60eaf675670f07a

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-07-29 15:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-17  1:07 [PATCH 1/3] arm64: dts: rockchip: Fix rk3399-roc-pc-plus analog audio Fabio Estevam
2026-07-29 15:59 ` Heiko Stuebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox