Skip to content

Commit 0a91cac

Browse files
bebarinoandersson
authored andcommitted
arm64: dts: qcom: sc7180-trogdor: Fix lpass dai link for HDMI
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 <[email protected]> Cc: Srinivas Kandagatla <[email protected]> Cc: Douglas Anderson <[email protected]> Fixes: b22d313 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI") Link: https://lore.kernel.org/r/[email protected] [1] Link: https://lore.kernel.org/r/[email protected] [2] Signed-off-by: Stephen Boyd <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 4420a0d commit 0a91cac

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@
273273
"Headphone Jack", "HPOL",
274274
"Headphone Jack", "HPOR";
275275

276-
#sound-dai-cells = <0>;
277276
#address-cells = <1>;
278277
#size-cells = <0>;
279278

@@ -301,11 +300,11 @@
301300
};
302301
};
303302

304-
dai-link@2 {
303+
dai-link@5 {
305304
link-name = "MultiMedia2";
306-
reg = <2>;
305+
reg = <LPASS_DP_RX>;
307306
cpu {
308-
sound-dai = <&lpass_cpu 2>;
307+
sound-dai = <&lpass_cpu LPASS_DP_RX>;
309308
};
310309

311310
codec {
@@ -782,7 +781,7 @@ hp_i2c: &i2c9 {
782781
qcom,playback-sd-lines = <0>;
783782
};
784783

785-
hdmi-primary@0 {
784+
hdmi@5 {
786785
reg = <LPASS_DP_RX>;
787786
};
788787
};

0 commit comments

Comments
 (0)