diff mbox series

[v4,2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI

Message ID 20210721080549.28822-3-srivasam@qti.qualcomm.com (mailing list archive)
State Accepted
Headers show
Series Qualcomm's lpass device tree changes | expand

Commit Message

Srinivasa Rao Mandadapu July 21, 2021, 8:05 a.m. UTC 
From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>

Add dai link in sc7180-trogdor.dtsi for supporting audio over DP

Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Signed-off-by: Srinivasa Rao Mandadapu <srivasam@qti.qualcomm.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Stephen Boyd Aug. 11, 2021, 6:06 a.m. UTC | #1 
Quoting Srinivasa Rao Mandadapu (2021-07-21 01:05:49)
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 31bf7c698b8f..a4cb9ee567ff 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -288,6 +288,7 @@ sound: sound {
>                         "Headphone Jack", "HPOL",
>                         "Headphone Jack", "HPOR";
>
> +               #sound-dai-cells = <0>;
>                 #address-cells = <1>;
>                 #size-cells = <0>;
>
> @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec {
>                                 sound-dai = <&max98357a>;
>                         };
>                 };
> +
> +               dai-link@2 {
> +                       link-name = "MultiMedia2";
> +                       reg = <2>;

Should this be

			reg = <LPASS_DP_RX>;

? And then the dai-link@2 should change to dai-link@5? It doesn't seem
to really matter though, so maybe not.

> +                       cpu {
> +                               sound-dai = <&lpass_cpu 2>;

This should be

				sound-dai = <&lpass_cpu LPASS_DP_RX>;

? At least from what I can tell without having it be 5 it doesn't work
properly and external audio over DP doesn't enumerate.

> +                       };
> +
> +                       codec {
> +                               sound-dai = <&mdss_dp>;
> +                       };
> +               };
>         };
>  };
>
> @@ -768,6 +781,10 @@ secondary_mi2s: mi2s@1 {
>                 reg = <MI2S_SECONDARY>;
>                 qcom,playback-sd-lines = <0>;
>         };
> +
> +       hdmi-primary@0 {

This should be hdmi-primary@5 to match the value of LPASS_DP_RX define

> +               reg = <LPASS_DP_RX>;
> +       };
>  };
Doug Anderson Aug. 11, 2021, 10:10 p.m. UTC | #2 
Hi,

On Tue, Aug 10, 2021 at 11:06 PM Stephen Boyd <swboyd@chromium.org> wrote:
>
> Quoting Srinivasa Rao Mandadapu (2021-07-21 01:05:49)
> > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> > index 31bf7c698b8f..a4cb9ee567ff 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> > @@ -288,6 +288,7 @@ sound: sound {
> >                         "Headphone Jack", "HPOL",
> >                         "Headphone Jack", "HPOR";
> >
> > +               #sound-dai-cells = <0>;
> >                 #address-cells = <1>;
> >                 #size-cells = <0>;
> >
> > @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec {
> >                                 sound-dai = <&max98357a>;
> >                         };
> >                 };
> > +
> > +               dai-link@2 {
> > +                       link-name = "MultiMedia2";
> > +                       reg = <2>;
>
> Should this be
>
>                         reg = <LPASS_DP_RX>;
>
> ? And then the dai-link@2 should change to dai-link@5? It doesn't seem
> to really matter though, so maybe not.
>
> > +                       cpu {
> > +                               sound-dai = <&lpass_cpu 2>;
>
> This should be
>
>                                 sound-dai = <&lpass_cpu LPASS_DP_RX>;
>
> ? At least from what I can tell without having it be 5 it doesn't work
> properly and external audio over DP doesn't enumerate.

I swear I provided feedback just like that. Yeah, here:

https://lore.kernel.org/r/CAD=FV=W3X8W90vPdrDAymzTKj-J7QPyn4ukaLSOhEkCme3+r_Q@mail.gmail.com

I think the problem is that the wrong patch landed. The one I see that
landed last week was v4 but I also see v7 of the same patch:

https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org/
Stephen Boyd Aug. 11, 2021, 10:20 p.m. UTC | #3 
Quoting Doug Anderson (2021-08-11 15:10:09)
>
> I swear I provided feedback just like that. Yeah, here:
>
> https://lore.kernel.org/r/CAD=FV=W3X8W90vPdrDAymzTKj-J7QPyn4ukaLSOhEkCme3+r_Q@mail.gmail.com
>
> I think the problem is that the wrong patch landed. The one I see that
> landed last week was v4 but I also see v7 of the same patch:
>
> https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org/

Yep. See https://lore.kernel.org/r/20210811194719.856593-1-swboyd@chromium.org
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 31bf7c698b8f..a4cb9ee567ff 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -288,6 +288,7 @@  sound: sound {
 			"Headphone Jack", "HPOL",
 			"Headphone Jack", "HPOR";
 
+		#sound-dai-cells = <0>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
@@ -314,6 +315,18 @@  sound_multimedia1_codec: codec {
 				sound-dai = <&max98357a>;
 			};
 		};
+
+		dai-link@2 {
+			link-name = "MultiMedia2";
+			reg = <2>;
+			cpu {
+				sound-dai = <&lpass_cpu 2>;
+			};
+
+			codec {
+				sound-dai = <&mdss_dp>;
+			};
+		};
 	};
 };
 
@@ -768,6 +781,10 @@  secondary_mi2s: mi2s@1 {
 		reg = <MI2S_SECONDARY>;
 		qcom,playback-sd-lines = <0>;
 	};
+
+	hdmi-primary@0 {
+		reg = <LPASS_DP_RX>;
+	};
 };
 
 &mdp {