[PATCH] arm64: dts: qcom: sc7180-trogdor: Fix lpass dai link for HDMI

This should be the dai for display port. Without this set properly we
fail to get audio routed through external displays on trogdor. It looks
like we picked up v4[1] of this patch when there was a v7[2]. The v7
patch still had the wrong sound-dai but at least we can fix all this up
and audio works.

Cc: V Sujith Kumar Reddy <redacted>
Cc: Srinivasa Rao Mandadapu <redacted>
Cc: Srinivas Kandagatla <redacted>
Fixes: b22d313e1772 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI")
Link: https://lore.kernel.org/r/20210721080549.28822-3-srivasam@qti.qualcomm.com [1]
Link: https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org [2]
Signed-off-by: Stephen Boyd <redacted>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 0f2b3c00e434..aba0dcdf01da 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

@@ -301,11 +301,11 @@ sound_multimedia1_codec: codec {
 			};
 		};
 
-		dai-link@2 {
+		dai-link@5 {
 			link-name = "MultiMedia2";
-			reg = <2>;
+			reg = <LPASS_DP_RX>;
 			cpu {
-				sound-dai = <&lpass_cpu 2>;
+				sound-dai = <&lpass_cpu LPASS_DP_RX>;
 			};
 
 			codec {

@@ -782,7 +782,7 @@ secondary_mi2s: mi2s@1 {
 		qcom,playback-sd-lines = <0>;
 	};
 
-	hdmi-primary@0 {
+	hdmi-primary@5 {
 		reg = <LPASS_DP_RX>;
 	};
 };

base-commit: 97ec669dfcfa22f8a595356ceb6ce46e7b4a82e9
-- 
https://chromeos.dev

Hi,

On Wed, Aug 11, 2021 at 12:47 PM Stephen Boyd [off-list ref] wrote:

This should be the dai for display port. Without this set properly we
fail to get audio routed through external displays on trogdor. It looks
like we picked up v4[1] of this patch when there was a v7[2]. The v7
patch still had the wrong sound-dai but at least we can fix all this up
and audio works.

Cc: V Sujith Kumar Reddy <redacted>
Cc: Srinivasa Rao Mandadapu <redacted>
Cc: Srinivas Kandagatla <redacted>
Fixes: b22d313e1772 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI")
Link: https://lore.kernel.org/r/20210721080549.28822-3-srivasam@qti.qualcomm.com [1]
Link: https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org [2]
Signed-off-by: Stephen Boyd <redacted>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

There were other changes between v4 and v7. Do we want to take those
too? Basically two things discussed in my response to v5 [1].

1. I think we don't need `#sound-dai-cells = <0>;`

2. It seemed marginally better to call the node `hdmi@5`, not `hdmi-primary@5`.

Also, in case you're comparing to v7, it looks like v7 still had a
bug, though, that your patch fixes. It still had "sound-dai =
<&lpass_cpu 2>;"

So confusing!

[1] https://lore.kernel.org/linux-arm-msm/CAD=FV=W3X8W90vPdrDAymzTKj-J7QPyn4ukaLSOhEkCme3+r_Q@mail.gmail.com/

-Doug

Quoting Doug Anderson (2021-08-11 15:28:02)

Hi,

On Wed, Aug 11, 2021 at 12:47 PM Stephen Boyd [off-list ref] wrote:

quoted

This should be the dai for display port. Without this set properly we
fail to get audio routed through external displays on trogdor. It looks
like we picked up v4[1] of this patch when there was a v7[2]. The v7
patch still had the wrong sound-dai but at least we can fix all this up
and audio works.

Cc: V Sujith Kumar Reddy <redacted>
Cc: Srinivasa Rao Mandadapu <redacted>
Cc: Srinivas Kandagatla <redacted>
Fixes: b22d313e1772 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI")
Link: https://lore.kernel.org/r/20210721080549.28822-3-srivasam@qti.qualcomm.com [1]
Link: https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org [2]
Signed-off-by: Stephen Boyd <redacted>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

There were other changes between v4 and v7. Do we want to take those
too? Basically two things discussed in my response to v5 [1].

Will you provide a Reviewed-by if I do? :)

1. I think we don't need `#sound-dai-cells = <0>;`

2. It seemed marginally better to call the node `hdmi@5`, not `hdmi-primary@5`.

Also, in case you're comparing to v7, it looks like v7 still had a
bug, though, that your patch fixes. It still had "sound-dai =
<&lpass_cpu 2>;"

So confusing!

Thanks. Hopefully v2 is better.