[PATCH] arm64: dts: mediatek: mt8195-cherry: Use correct audio codec DAI

Fei Shao posted 1 patch 1 month ago
arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[PATCH] arm64: dts: mediatek: mt8195-cherry: Use correct audio codec DAI
Posted by Fei Shao 1 month ago
The RT5682i and RT5682s drivers describe two DAIs: AIF1 supports both
playback and capture, while AIF2 supports capture only.

Cherry doesn't specify which DAI to use. Although this doesn't cause
real issues because AIF1 happens to be the first DAI, it should be
corrected:
    codec@1a: #sound-dai-cells: 1 was expected

Update #sound-dai-cells to 1 and adjust DAI link usages accordingly.

Fixes: 87728e3ccf35 ("arm64: dts: mediatek: mt8195-cherry: Specify sound DAI links and routing")
Signed-off-by: Fei Shao <fshao@chromium.org>
---

 arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
index 75d56b2d5a3d..2c7b2223ee76 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
@@ -438,7 +438,7 @@ audio_codec: codec@1a {
 		/* Realtek RT5682i or RT5682s, sharing the same configuration */
 		reg = <0x1a>;
 		interrupts-extended = <&pio 89 IRQ_TYPE_EDGE_BOTH>;
-		#sound-dai-cells = <0>;
+		#sound-dai-cells = <1>;
 		realtek,jd-src = <1>;
 
 		AVDD-supply = <&mt6359_vio18_ldo_reg>;
@@ -1181,7 +1181,7 @@ hs-playback-dai-link {
 		link-name = "ETDM1_OUT_BE";
 		mediatek,clk-provider = "cpu";
 		codec {
-			sound-dai = <&audio_codec>;
+			sound-dai = <&audio_codec 0>;
 		};
 	};
 
@@ -1189,7 +1189,7 @@ hs-capture-dai-link {
 		link-name = "ETDM2_IN_BE";
 		mediatek,clk-provider = "cpu";
 		codec {
-			sound-dai = <&audio_codec>;
+			sound-dai = <&audio_codec 0>;
 		};
 	};
 
-- 
2.47.0.rc1.288.g06298d1525-goog
Re: [PATCH] arm64: dts: mediatek: mt8195-cherry: Use correct audio codec DAI
Posted by AngeloGioacchino Del Regno 1 month ago
On Mon, 21 Oct 2024 19:39:33 +0800, Fei Shao wrote:
> The RT5682i and RT5682s drivers describe two DAIs: AIF1 supports both
> playback and capture, while AIF2 supports capture only.
> 
> Cherry doesn't specify which DAI to use. Although this doesn't cause
> real issues because AIF1 happens to be the first DAI, it should be
> corrected:
>     codec@1a: #sound-dai-cells: 1 was expected
> 
> [...]

Applied to v6.12-next/dts64, thanks!

[1/1] arm64: dts: mediatek: mt8195-cherry: Use correct audio codec DAI
      commit: 7d5794e6d964940e46286fadbe69a3245fa51e44

Cheers,
Angelo