[PATCH v2 1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP

[PATCH v2 1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP

[Krzysztof Kozlowski]

Sound DAI devices exposing same set of mixers, e.g. each DisplayPort
controller, need to add dedicated prefix for these mixers to avoid
conflicts and to allow ALSA to properly configure given instance.

Suggested-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

---

Changes in v2:
1. New patch
---
 arch/arm64/boot/dts/qcom/hamoa.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
index a17900eacb20..c3119a6c28ec 100644
--- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
@@ -5579,6 +5579,7 @@ mdss_dp0: displayport-controller@ae90000 {
 				phy-names = "dp";
 
 				#sound-dai-cells = <0>;
+				sound-name-prefix = "DisplayPort0";
 
 				status = "disabled";
 
@@ -5667,6 +5668,7 @@ mdss_dp1: displayport-controller@ae98000 {
 				phy-names = "dp";
 
 				#sound-dai-cells = <0>;
+				sound-name-prefix = "DisplayPort1";
 
 				status = "disabled";
 
@@ -5755,6 +5757,7 @@ mdss_dp2: displayport-controller@ae9a000 {
 				phy-names = "dp";
 
 				#sound-dai-cells = <0>;
+				sound-name-prefix = "DisplayPort2";
 
 				status = "disabled";
 
@@ -5838,6 +5841,7 @@ mdss_dp3: displayport-controller@aea0000 {
 				phy-names = "dp";
 
 				#sound-dai-cells = <0>;
+				sound-name-prefix = "DisplayPort3";
 
 				status = "disabled";
 
-- 
2.51.0

[PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Krzysztof Kozlowski]

Add necessary DAI links and DAI name prefixes to enable audio playback
over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
should carry respective DAI name prefix regardless.

Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

---

ALSA UCM and audioreach topology will follow up as well.

Changes in v2:
1. Move name prefixes to patch #1
2. Rb tag
---
 .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
index 80ece9db875a..7aee9a20c6df 100644
--- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
@@ -351,6 +351,54 @@ sound {
 				"VA DMIC1", "VA MIC BIAS1",
 				"TX SWR_INPUT1", "ADC2_OUTPUT";
 
+		displayport-0-dai-link {
+			link-name = "DisplayPort0 Playback";
+
+			codec {
+				sound-dai = <&mdss_dp0>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai DISPLAY_PORT_RX_0>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
+		displayport-1-dai-link {
+			link-name = "DisplayPort1 Playback";
+
+			codec {
+				sound-dai = <&mdss_dp1>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai DISPLAY_PORT_RX_1>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
+		displayport-2-dai-link {
+			link-name = "DisplayPort2 Playback";
+
+			codec {
+				sound-dai = <&mdss_dp2>;
+			};
+
+			cpu {
+				sound-dai = <&q6apmbedai DISPLAY_PORT_RX_2>;
+			};
+
+			platform {
+				sound-dai = <&q6apm>;
+			};
+		};
+
 		wcd-playback-dai-link {
 			link-name = "WCD Playback";
 
-- 
2.51.0

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Konrad Dybcio]

On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
> Add necessary DAI links and DAI name prefixes to enable audio playback
> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
> should carry respective DAI name prefix regardless.
> 
> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> 
> ---

(something's inserting a \n before --- in your latest patches but I
don't know if this is a problem)

[...]

> +		displayport-2-dai-link {
> +			link-name = "DisplayPort2 Playback";
> +
> +			codec {
> +				sound-dai = <&mdss_dp2>;

How does this work out with fw_devlink?

Konrad

Re: [PATCH v2 1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP

[Konrad Dybcio]

On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
> Sound DAI devices exposing same set of mixers, e.g. each DisplayPort
> controller, need to add dedicated prefix for these mixers to avoid
> conflicts and to allow ALSA to properly configure given instance.
> 
> Suggested-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> 
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Krzysztof Kozlowski]

On 17/12/2025 13:33, Konrad Dybcio wrote:
> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>> Add necessary DAI links and DAI name prefixes to enable audio playback
>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>> should carry respective DAI name prefix regardless.
>>
>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>
>> ---
> 
> (something's inserting a \n before --- in your latest patches but I

No, it is not. It was always like that and only recently git started
dropping it, but it is irrelevant.

> don't know if this is a problem)
> 
> [...]
> 
>> +		displayport-2-dai-link {
>> +			link-name = "DisplayPort2 Playback";
>> +
>> +			codec {
>> +				sound-dai = <&mdss_dp2>;
> 
> How does this work out with fw_devlink?

How is this related to this patchset? Please stop nit-picking irrelevant
things.

Best regards,
Krzysztof

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Konrad Dybcio]

On 12/17/25 1:38 PM, Krzysztof Kozlowski wrote:
> On 17/12/2025 13:33, Konrad Dybcio wrote:
>> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>>> Add necessary DAI links and DAI name prefixes to enable audio playback
>>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>>> should carry respective DAI name prefix regardless.
>>>
>>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>
>>> ---
>>
>> (something's inserting a \n before --- in your latest patches but I
> 
> No, it is not. It was always like that and only recently git started
> dropping it, but it is irrelevant.
> 
>> don't know if this is a problem)
>>
>> [...]
>>
>>> +		displayport-2-dai-link {
>>> +			link-name = "DisplayPort2 Playback";
>>> +
>>> +			codec {
>>> +				sound-dai = <&mdss_dp2>;
>>
>> How does this work out with fw_devlink?
> 
> How is this related to this patchset? Please stop nit-picking irrelevant
> things.

I'm asking whether this is going to break sync_state because you're not
enabling mdss_dp2 - I believe that's a fair question..

Konrad

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Krzysztof Kozlowski]

On 17/12/2025 13:51, Konrad Dybcio wrote:
> On 12/17/25 1:38 PM, Krzysztof Kozlowski wrote:
>> On 17/12/2025 13:33, Konrad Dybcio wrote:
>>> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>>>> Add necessary DAI links and DAI name prefixes to enable audio playback
>>>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>>>> should carry respective DAI name prefix regardless.
>>>>
>>>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>>
>>>> ---
>>>
>>> (something's inserting a \n before --- in your latest patches but I
>>
>> No, it is not. It was always like that and only recently git started
>> dropping it, but it is irrelevant.
>>
>>> don't know if this is a problem)
>>>
>>> [...]
>>>
>>>> +		displayport-2-dai-link {
>>>> +			link-name = "DisplayPort2 Playback";
>>>> +
>>>> +			codec {
>>>> +				sound-dai = <&mdss_dp2>;
>>>
>>> How does this work out with fw_devlink?
>>
>> How is this related to this patchset? Please stop nit-picking irrelevant
>> things.
> 
> I'm asking whether this is going to break sync_state because you're not
> enabling mdss_dp2 - I believe that's a fair question..

DTS description is independent of driver, thus this is correct code
regardless whether there is interconnect involved anywhere or not. I
don't have the answer how this affects interconnect, but I see no reason
anyone would create such ICC path - between hardware and fake SW construct.

Best regards,
Krzysztof

Re: [PATCH v2 1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP

[Dmitry Baryshkov]

On Wed, Dec 17, 2025 at 01:00:52PM +0100, Krzysztof Kozlowski wrote:
> Sound DAI devices exposing same set of mixers, e.g. each DisplayPort
> controller, need to add dedicated prefix for these mixers to avoid
> conflicts and to allow ALSA to properly configure given instance.
> 
> Suggested-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> 
> ---
> 
> Changes in v2:
> 1. New patch
> ---
>  arch/arm64/boot/dts/qcom/hamoa.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Konrad Dybcio]

On 12/17/25 2:00 PM, Krzysztof Kozlowski wrote:
> On 17/12/2025 13:51, Konrad Dybcio wrote:
>> On 12/17/25 1:38 PM, Krzysztof Kozlowski wrote:
>>> On 17/12/2025 13:33, Konrad Dybcio wrote:
>>>> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>>>>> Add necessary DAI links and DAI name prefixes to enable audio playback
>>>>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>>>>> should carry respective DAI name prefix regardless.
>>>>>
>>>>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>>>
>>>>> ---
>>>>
>>>> (something's inserting a \n before --- in your latest patches but I
>>>
>>> No, it is not. It was always like that and only recently git started
>>> dropping it, but it is irrelevant.
>>>
>>>> don't know if this is a problem)
>>>>
>>>> [...]
>>>>
>>>>> +		displayport-2-dai-link {
>>>>> +			link-name = "DisplayPort2 Playback";
>>>>> +
>>>>> +			codec {
>>>>> +				sound-dai = <&mdss_dp2>;
>>>>
>>>> How does this work out with fw_devlink?
>>>
>>> How is this related to this patchset? Please stop nit-picking irrelevant
>>> things.
>>
>> I'm asking whether this is going to break sync_state because you're not
>> enabling mdss_dp2 - I believe that's a fair question..
> 
> DTS description is independent of driver, thus this is correct code
> regardless whether there is interconnect involved anywhere or not. I
> don't have the answer how this affects interconnect, but I see no reason
> anyone would create such ICC path - between hardware and fake SW construct.

sync_state isn't exclusive to the interconnect framework

In any case, could you please confirm/deny that sound still works as
expected with linux-next/master + this patch alone and we move on?

Konrad

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Krzysztof Kozlowski]

On 19/12/2025 13:53, Konrad Dybcio wrote:
> On 12/17/25 2:00 PM, Krzysztof Kozlowski wrote:
>> On 17/12/2025 13:51, Konrad Dybcio wrote:
>>> On 12/17/25 1:38 PM, Krzysztof Kozlowski wrote:
>>>> On 17/12/2025 13:33, Konrad Dybcio wrote:
>>>>> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>>>>>> Add necessary DAI links and DAI name prefixes to enable audio playback
>>>>>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>>>>>> should carry respective DAI name prefix regardless.
>>>>>>
>>>>>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>>>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>>>>
>>>>>> ---
>>>>>
>>>>> (something's inserting a \n before --- in your latest patches but I
>>>>
>>>> No, it is not. It was always like that and only recently git started
>>>> dropping it, but it is irrelevant.
>>>>
>>>>> don't know if this is a problem)
>>>>>
>>>>> [...]
>>>>>
>>>>>> +		displayport-2-dai-link {
>>>>>> +			link-name = "DisplayPort2 Playback";
>>>>>> +
>>>>>> +			codec {
>>>>>> +				sound-dai = <&mdss_dp2>;
>>>>>
>>>>> How does this work out with fw_devlink?
>>>>
>>>> How is this related to this patchset? Please stop nit-picking irrelevant
>>>> things.
>>>
>>> I'm asking whether this is going to break sync_state because you're not
>>> enabling mdss_dp2 - I believe that's a fair question..
>>
>> DTS description is independent of driver, thus this is correct code
>> regardless whether there is interconnect involved anywhere or not. I
>> don't have the answer how this affects interconnect, but I see no reason
>> anyone would create such ICC path - between hardware and fake SW construct.
> 
> sync_state isn't exclusive to the interconnect framework
> 
> In any case, could you please confirm/deny that sound still works as
> expected with linux-next/master + this patch alone and we move on?

It was working all the time - I was using it on my machine for 3 months
already. Other people are also using it, because it is part of our
laptop tree and no regressions or issues were reported.

Best regards,
Krzysztof

Re: [PATCH v2 2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort

[Konrad Dybcio]

On 12/19/25 1:57 PM, Krzysztof Kozlowski wrote:
> On 19/12/2025 13:53, Konrad Dybcio wrote:
>> On 12/17/25 2:00 PM, Krzysztof Kozlowski wrote:
>>> On 17/12/2025 13:51, Konrad Dybcio wrote:
>>>> On 12/17/25 1:38 PM, Krzysztof Kozlowski wrote:
>>>>> On 17/12/2025 13:33, Konrad Dybcio wrote:
>>>>>> On 12/17/25 1:00 PM, Krzysztof Kozlowski wrote:
>>>>>>> Add necessary DAI links and DAI name prefixes to enable audio playback
>>>>>>> over USB/DisplayPort and HDMI.  The HDMI port is not yet enabled, but it
>>>>>>> should carry respective DAI name prefix regardless.
>>>>>>>
>>>>>>> Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
>>>>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>>>>>
>>>>>>> ---
>>>>>>
>>>>>> (something's inserting a \n before --- in your latest patches but I
>>>>>
>>>>> No, it is not. It was always like that and only recently git started
>>>>> dropping it, but it is irrelevant.
>>>>>
>>>>>> don't know if this is a problem)
>>>>>>
>>>>>> [...]
>>>>>>
>>>>>>> +		displayport-2-dai-link {
>>>>>>> +			link-name = "DisplayPort2 Playback";
>>>>>>> +
>>>>>>> +			codec {
>>>>>>> +				sound-dai = <&mdss_dp2>;
>>>>>>
>>>>>> How does this work out with fw_devlink?
>>>>>
>>>>> How is this related to this patchset? Please stop nit-picking irrelevant
>>>>> things.
>>>>
>>>> I'm asking whether this is going to break sync_state because you're not
>>>> enabling mdss_dp2 - I believe that's a fair question..
>>>
>>> DTS description is independent of driver, thus this is correct code
>>> regardless whether there is interconnect involved anywhere or not. I
>>> don't have the answer how this affects interconnect, but I see no reason
>>> anyone would create such ICC path - between hardware and fake SW construct.
>>
>> sync_state isn't exclusive to the interconnect framework
>>
>> In any case, could you please confirm/deny that sound still works as
>> expected with linux-next/master + this patch alone and we move on?
> 
> It was working all the time - I was using it on my machine for 3 months
> already. Other people are also using it, because it is part of our
> laptop tree and no regressions or issues were reported.

Thanks, all of my previous comments stemmed from the worries of
side-effects of referencing a status=disabled node

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: (subset) [PATCH v2 1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP

[Bjorn Andersson]

On Wed, 17 Dec 2025 13:00:52 +0100, Krzysztof Kozlowski wrote:
> Sound DAI devices exposing same set of mixers, e.g. each DisplayPort
> controller, need to add dedicated prefix for these mixers to avoid
> conflicts and to allow ALSA to properly configure given instance.
> 
> 

Applied, thanks!

[1/2] arm64: dts: qcom: hamoa: Add sound DAI prefixes for DP
      commit: d12cd85a4ff494bb73e2e8f8af7ed66851241941
[2/2] arm64: dts: qcom: x1e78100-t14s: Add audio playback over DisplayPort
      commit: ba439ad9134c8b9ce033056c059cd161d30afec7

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>