[PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Krzysztof Kozlowski]

Add support for playing audio over USB DisplayPort (the two left USB-C
ports on the CRD device).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 34 +++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index c39dd493a3af..08032c02fc22 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -189,6 +189,38 @@ sound {
 				"VA DMIC3", "VA MIC BIAS1",
 				"TX SWR_INPUT1", "ADC2_OUTPUT";
 
+		displayport-0-dai-link {
+			link-name = "DisplayPort0 Playback";
+
+			cpu {
+				sound-dai = <&q6apmbedai DISPLAY_PORT_RX_0>;
+			};
+
+			codec {
+				sound-dai = <&mdss_dp0>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
+		displayport-1-dai-link {
+			link-name = "DisplayPort1 Playback";
+
+			cpu {
+				sound-dai = <&q6apmbedai DISPLAY_PORT_RX_1>;
+			};
+
+			codec {
+				sound-dai = <&mdss_dp1>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
 		wcd-playback-dai-link {
 			link-name = "WCD Playback";
 
@@ -836,6 +868,7 @@ &mdss {
 };
 
 &mdss_dp0 {
+	sound-name-prefix = "DisplayPort0";
 	status = "okay";
 };
 
@@ -845,6 +878,7 @@ &mdss_dp0_out {
 };
 
 &mdss_dp1 {
+	sound-name-prefix = "DisplayPort1";
 	status = "okay";
 };
 
-- 
2.43.0

Re: [PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Konrad Dybcio]

On 6/4/24 11:49, Krzysztof Kozlowski wrote:
> Add support for playing audio over USB DisplayPort (the two left USB-C
> ports on the CRD device).
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---

Looks sane. Are any UCM changes necessary?

Konrad

Re: [PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Krzysztof Kozlowski]

On 04/06/2024 13:56, Konrad Dybcio wrote:
> 
> 
> On 6/4/24 11:49, Krzysztof Kozlowski wrote:
>> Add support for playing audio over USB DisplayPort (the two left USB-C
>> ports on the CRD device).
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
> 
> Looks sane. Are any UCM changes necessary?

Yes. I already sent topology pull request. For UCM I will send something
soon.

Best regards,
Krzysztof

Re: [PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Konrad Dybcio]

On 6/4/24 13:59, Krzysztof Kozlowski wrote:
> On 04/06/2024 13:56, Konrad Dybcio wrote:
>>
>>
>> On 6/4/24 11:49, Krzysztof Kozlowski wrote:
>>> Add support for playing audio over USB DisplayPort (the two left USB-C
>>> ports on the CRD device).
>>>
>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>> ---
>>
>> Looks sane. Are any UCM changes necessary?
> 
> Yes. I already sent topology pull request. For UCM I will send something
> soon.

Great, thanks

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad

Re: [PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Bjorn Andersson]

On Tue, Jun 04, 2024 at 11:49:47AM GMT, Krzysztof Kozlowski wrote:
> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
[..]
> @@ -836,6 +868,7 @@ &mdss {
>  };
>  
>  &mdss_dp0 {

I don't seem to have this node, did I loose a patch somewhere?

Regards,
Bjorn

> +	sound-name-prefix = "DisplayPort0";
>  	status = "okay";
>  };

Re: [PATCH] arm64: dts: qcom: x1e80100-crd: add USB DisplayPort audio

[Krzysztof Kozlowski]

On 06/06/2024 04:47, Bjorn Andersson wrote:
> On Tue, Jun 04, 2024 at 11:49:47AM GMT, Krzysztof Kozlowski wrote:
>> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
> [..]
>> @@ -836,6 +868,7 @@ &mdss {
>>  };
>>  
>>  &mdss_dp0 {
> 
> I don't seem to have this node, did I loose a patch somewhere?
> 

I rebased my branch on top of Abel's work/next branches for x1e80100,
assuming he sent the USB display port. Apparently this is not the case,
so this makes little sense now. Sorry for the noise, I will come back
once Abel's work get posted or merged.

Best regards,
Krzysztof