[PATCH 1/2] arm64: dts: qcom: sc8280xp-microsoft-blackrock: enable DisplayPort audio
From: Jens Glathe via B4 Relay
Date: Sun Aug 23 2026 - 04:36:49 EST
From: Jens Glathe <jens.glathe@xxxxxxxxxxxxxxxxxxxxxx>
The Windows Dev Kit 2023 has no built-in speakers, microphones or
headphone jack. Likewise the device with the same mainboard, Surface
Pro 9 5G [1]. The previous WCD938x / WSA / VA sound card definition
was therefore non-functional.
Replace the unused codec nodes, SoundWire controllers, LPASS macros
and related pinctrl with DisplayPort DAI links (DP0/DP1/DP2) so that
audio is available over the DP connectors. Add the required
sound-name-prefix properties and update the card model name to the
conventional SC8280XP-MICROSOFT-BLACKROCK form.
[1]: https://support.microsoft.com/en-us/surface/models/surface-pro-9-features-and-specs
Fixes: 16a7fed11714 ("arm64: dts: qcom: sc8280xp-blackrock: dt definition for WDK2023")
Signed-off-by: Jens Glathe <jens.glathe@xxxxxxxxxxxxxxxxxxxxxx>
---
.../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 134 +++------------------
1 file changed, 20 insertions(+), 114 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index 4f4b5f4285ec2..a94141d670f62 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -28,32 +28,6 @@ aliases {
serial1 = &uart2;
};
- wcd938x: audio-codec {
- compatible = "qcom,wcd9380-codec";
-
- pinctrl-0 = <&wcd_default>;
- pinctrl-names = "default";
-
- reset-gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
-
- vdd-buck-supply = <&vreg_s10b>;
- vdd-rxtx-supply = <&vreg_s10b>;
- vdd-io-supply = <&vreg_s10b>;
- vdd-mic-bias-supply = <&vreg_bob>;
-
- qcom,micbias1-microvolt = <1800000>;
- qcom,micbias2-microvolt = <1800000>;
- qcom,micbias3-microvolt = <1800000>;
- qcom,micbias4-microvolt = <1800000>;
- qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
- qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
- qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
- qcom,rx-device = <&wcd_rx>;
- qcom,tx-device = <&wcd_tx>;
-
- #sound-dai-cells = <1>;
- };
-
dp3_connector: connector {
compatible = "dp-connector";
label = "DP-3";
@@ -585,6 +559,7 @@ &mdss0 {
};
&mdss0_dp0 {
+ sound-name-prefix = "DisplayPort0";
status = "okay";
};
@@ -594,6 +569,7 @@ &mdss0_dp0_out {
};
&mdss0_dp1 {
+ sound-name-prefix = "DisplayPort1";
status = "okay";
};
@@ -603,6 +579,7 @@ &mdss0_dp1_out {
};
&mdss0_dp2 {
+ sound-name-prefix = "DisplayPort2";
compatible = "qcom,sc8280xp-dp";
data-lanes = <0 1 2 3>;
@@ -858,17 +835,17 @@ &rxmacro {
&sound {
compatible = "qcom,sc8280xp-sndcard";
- model = "microsoft/blackrock";
+ model = "SC8280XP-MICROSOFT-BLACKROCK";
- wcd-playback-dai-link {
- link-name = "WCD Playback";
+ dp0-dai-link {
+ link-name = "DP0 Playback";
- cpu {
- sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>;
+ codec {
+ sound-dai = <&mdss0_dp0>;
};
- codec {
- sound-dai = <&wcd938x 0>, <&swr1 0>, <&rxmacro 0>;
+ cpu {
+ sound-dai = <&q6apmbedai DISPLAY_PORT_RX_0>;
};
platform {
@@ -876,15 +853,15 @@ platform {
};
};
- wcd-capture-dai-link {
- link-name = "WCD Capture";
+ dp1-dai-link {
+ link-name = "DP1 Playback";
- cpu {
- sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;
+ codec {
+ sound-dai = <&mdss0_dp1>;
};
- codec {
- sound-dai = <&wcd938x 1>, <&swr2 0>, <&txmacro 0>;
+ cpu {
+ sound-dai = <&q6apmbedai DISPLAY_PORT_RX_1>;
};
platform {
@@ -892,67 +869,23 @@ platform {
};
};
- wsa-dai-link {
- link-name = "WSA Playback";
-
- cpu {
- sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>;
- };
+ dp2-dai-link {
+ link-name = "DP2 Playback";
codec {
- sound-dai = <&swr0 0>, <&wsamacro 0>;
- };
-
- platform {
- sound-dai = <&q6apm>;
+ sound-dai = <&mdss0_dp2>;
};
- };
-
- va-dai-link {
- link-name = "VA Capture";
cpu {
- sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>;
+ sound-dai = <&q6apmbedai DISPLAY_PORT_RX_2>;
};
platform {
sound-dai = <&q6apm>;
};
-
- codec {
- sound-dai = <&vamacro 0>;
- };
- };
-};
-
-&swr0 {
- status = "okay";
-};
-
-&swr1 {
- status = "okay";
-
- wcd_rx: wcd9380-rx@0,4 {
- compatible = "sdw20217010d00";
- reg = <0 4>;
- qcom,rx-port-mapping = <1 2 3 4 5>;
- };
-};
-
-&swr2 {
- status = "okay";
-
- wcd_tx: wcd9380-tx@0,3 {
- compatible = "sdw20217010d00";
- reg = <0 3>;
- qcom,tx-port-mapping = <1 1 2 3>;
};
};
-&txmacro {
- status = "okay";
-};
-
&uart2 {
pinctrl-0 = <&uart2_default>;
pinctrl-names = "default";
@@ -1076,31 +1009,12 @@ &usb_2_qmpphy0 {
status = "okay";
};
-&vamacro {
- pinctrl-0 = <&dmic01_default>, <&dmic23_default>;
- pinctrl-names = "default";
-
- vdd-micb-supply = <&vreg_s10b>;
-
- qcom,dmic-sample-rate = <4800000>;
-
- status = "okay";
-};
-
-&wsamacro {
- status = "okay";
-};
-
&xo_board_clk {
clock-frequency = <38400000>;
};
/* PINCTRL */
-&lpass_tlmm {
- status = "okay";
-};
-
&pmc8280_1_gpios {
misc_3p3_reg_en: misc-3p3-reg-en-state {
pins = "gpio1";
@@ -1302,14 +1216,6 @@ usb2_en_state: usb2-en-state {
output-low;
};
- wcd_default: wcd-default-state {
- reset-pins {
- pins = "gpio106";
- function = "gpio";
- bias-disable;
- };
- };
-
wlan_en: wlan-en-state {
pins = "gpio134";
function = "gpio";
--
2.53.0