Skip to contentSkip to conversation

arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962

PATCH Applied Adam Ford 2 participants 3 messages Jul 14, 2024 – Aug 12, 2024

Subsystems (2)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962

The L/R clock needs to be controlled by the SAI3 instead of the CODEC to properly achieve stereo sound. Doing this allows removes the need for unnecessary clock manipulation to try to get the CODEC's clock in sync with the SAI3 clock, since the CODEC can cope with a wide variety of clock inputs.

Fixes 161af16c18f3 ("arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock")
Fixes 69e2f37a6ddc ("arm64: dts: imx8mp-beacon-kit: Enable WM8962 Audio CODEC")
arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts +5 -7
index 1871c10f5c12..de5b64fa479a 100644
@@ -222,13 +222,12 @@ sound-wm8962 {
 
 		simple-audio-card,cpu {
 			sound-dai = <&sai3>;
+			frame-master;
+			bitclock-master;
 		};
 
 		simple-audio-card,codec {
 			sound-dai = <&wm8962>;
-			clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;
-			frame-master;
-			bitclock-master;
 		};
 	};
 };
@@ -544,10 +543,9 @@ &pcie_phy {
 &sai3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sai3>;
-	assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
-			  <&clk IMX8MP_AUDIO_PLL2> ;
-	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
-	assigned-clock-rates = <12288000>, <361267200>;
+	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <12288000>;
 	fsl,sai-mclk-direction-output;
 	status = "okay";
 };
Signature · 1 line
2.43.0
author
#1 lore raw
Quoted 6 lines · Adam Ford

The L/R clock needs to be controlled by the SAI3 instead of the CODEC to properly achieve stereo sound. Doing this allows removes the need for unnecessary clock manipulation to try to get the CODEC's clock in sync with the SAI3 clock, since the CODEC can cope with a wide variety of clock inputs.

Shawn,

Any chance this could get reviewed and/or applied?

thanks,

adam

Quoted 42 lines
Fixes 161af16c18f3 ("arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock")
Fixes 69e2f37a6ddc ("arm64: dts: imx8mp-beacon-kit: Enable WM8962 Audio CODEC")
arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts +5 -8
index 1871c10f5c12..de5b64fa479a 100644
@@ -222,13 +222,12 @@ sound-wm8962 {
 
                simple-audio-card,cpu {
                        sound-dai = <&sai3>;
+                       frame-master;
+                       bitclock-master;
                };
 
                simple-audio-card,codec {
                        sound-dai = <&wm8962>;
-                       clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;
-                       frame-master;
-                       bitclock-master;
                };
        };
 };
@@ -544,10 +543,9 @@ &pcie_phy {
 &sai3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_sai3>;
-       assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
-                         <&clk IMX8MP_AUDIO_PLL2> ;
-       assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
-       assigned-clock-rates = <12288000>, <361267200>;
+       assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+       assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+       assigned-clock-rates = <12288000>;
        fsl,sai-mclk-direction-output;
        status = "okay";
 };
--

2.43.0

Applied
#2 lore raw
In reply to Adam Ford
Quoted 9 lines · Adam Ford

The L/R clock needs to be controlled by the SAI3 instead of the CODEC to properly achieve stereo sound. Doing this allows removes the need for unnecessary clock manipulation to try to get the CODEC's clock in sync with the SAI3 clock, since the CODEC can cope with a wide variety of clock inputs.

Fixes 161af16c18f3 ("arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock")
Fixes 69e2f37a6ddc ("arm64: dts: imx8mp-beacon-kit: Enable WM8962 Audio CODEC")

Applied, thanks!