[v3,1/2] arm64: dts: rockchip: use codec as clock master on px30-ringneck-haikou

Commit Message

Jakob Unterwurzacher Sept. 7, 2023, 3:17 p.m. UTC

From: Ermin Sunj <[e-mail]>

If the codec is not the clock master, the MCLK needs to be
synchronous to both I2S_SCL ans I2S_LRCLK. We do not have that
on Haikou, causing distorted audio.

Before:

 Running an audio test script on Ringneck, 1kHz
 output sine wave is not stable and shows distortion.

After:

 10h audio test script loop failed only one time.
 That is 0.00014% failure rate.

Cc: [e-mail]
Fixes: c484cf93f61b ("arm64: dts: rockchip: add PX30-µQ7 (Ringneck) SoM with Haikou baseboard")
Signed-off-by: Ermin Sunj <[e-mail]>
Signed-off-by: Jakob Unterwurzacher <[e-mail]>
---

Notes:
    v1: https://lore.kernel.org/lkml/[e-mail]/
    v2: https://lore.kernel.org/lkml/[e-mail]/

 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Heiko Stübner Oct. 4, 2023, 9:32 p.m. UTC | #1

On Thu, 7 Sep 2023 17:17:15 +0200, Jakob Unterwurzacher wrote:
> From: Ermin Sunj <[e-mail]>
> 
> If the codec is not the clock master, the MCLK needs to be
> synchronous to both I2S_SCL ans I2S_LRCLK. We do not have that
> on Haikou, causing distorted audio.
> 
> Before:
> 
> [...]

Applied, thanks!

[1/2] arm64: dts: rockchip: use codec as clock master on px30-ringneck-haikou
      commit: 84fa1865edbb3800f3344e2a5bc73c187adf42d0
[2/2] arm64: dts: rockchip: set codec system-clock-fixed on px30-ringneck-haikou
      commit: 1e585cd0aad3d491938230318d6d479f09589fd8

Best regards,

Patch

diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
index 08a3ad3e7ae9..8792fae50257 100644
--- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
@@ -68,15 +68,15 @@  i2s0-sound {
 		simple-audio-card,format = "i2s";
 		simple-audio-card,name = "Haikou,I2S-codec";
 		simple-audio-card,mclk-fs = <512>;
+		simple-audio-card,frame-master = <&sgtl5000_codec>;
+		simple-audio-card,bitclock-master = <&sgtl5000_codec>;
 
-		simple-audio-card,codec {
+		sgtl5000_codec: simple-audio-card,codec {
 			clocks = <&sgtl5000_clk>;
 			sound-dai = <&sgtl5000>;
 		};
 
 		simple-audio-card,cpu {
-			bitclock-master;
-			frame-master;
 			sound-dai = <&i2s0_8ch>;
 		};
 	};