diff mbox series

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

Message ID 20210811224141.1110495-1-swboyd@chromium.org (mailing list archive)
State Queued
Headers show
Series [v2] arm64: dts: qcom: sc7180-trogdor: Fix lpass dai link for HDMI | expand

Commit Message

Stephen Boyd Aug. 11, 2021, 10:41 p.m. UTC 
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: Srinivasa Rao Mandadapu <srivasam@qti.qualcomm.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Douglas Anderson <dianders@chromium.org>
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 <swboyd@chromium.org>
---

Changes from v1:
 - Drop sound-dai-cells
 - Replace hdmi-primary with hdmi

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


base-commit: 97ec669dfcfa22f8a595356ceb6ce46e7b4a82e9

Comments

Doug Anderson Aug. 11, 2021, 10:45 p.m. UTC | #1 
Hi,

On Wed, Aug 11, 2021 at 3:41 PM Stephen Boyd <swboyd@chromium.org> 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: Srinivasa Rao Mandadapu <srivasam@qti.qualcomm.com>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> 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 <swboyd@chromium.org>
> ---
>
> Changes from v1:
>  - Drop sound-dai-cells
>  - Replace hdmi-primary with hdmi
>
>  arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)

I'm no audio expert, but this matches v7 except for the bugfix setting
the ID for the `sound-dai` to be LPASS_DP_RX instead of 2, which
matches downstream.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Doug Anderson Aug. 16, 2021, 9:46 p.m. UTC | #2 
Bjorn,

On Wed, Aug 11, 2021 at 3:45 PM Doug Anderson <dianders@chromium.org> wrote:
>
> Hi,
>
> On Wed, Aug 11, 2021 at 3:41 PM Stephen Boyd <swboyd@chromium.org> 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: Srinivasa Rao Mandadapu <srivasam@qti.qualcomm.com>
> > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> > Cc: Douglas Anderson <dianders@chromium.org>
> > 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 <swboyd@chromium.org>
> > ---
> >
> > Changes from v1:
> >  - Drop sound-dai-cells
> >  - Replace hdmi-primary with hdmi
> >
> >  arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 ++++-----
> >  1 file changed, 4 insertions(+), 5 deletions(-)
>
> I'm no audio expert, but this matches v7 except for the bugfix setting
> the ID for the `sound-dai` to be LPASS_DP_RX instead of 2, which
> matches downstream.
>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>

Since this is a "Fix" and it's my understanding that Fixes can be
landed / pull requests sent for them anytime (regardless of the fact
that it's currently -rc6) maybe it could still land without waiting
for the merge window to start and end?

-Doug
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 0f2b3c00e434..70c88c37de32 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -273,7 +273,6 @@  sound: sound {
 			"Headphone Jack", "HPOL",
 			"Headphone Jack", "HPOR";
 
-		#sound-dai-cells = <0>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
@@ -301,11 +300,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 +781,7 @@  secondary_mi2s: mi2s@1 {
 		qcom,playback-sd-lines = <0>;
 	};
 
-	hdmi-primary@0 {
+	hdmi@5 {
 		reg = <LPASS_DP_RX>;
 	};
 };