Skip to content

Commit 7710f80

Browse files
Srinivas-Kandagatlaandersson
authored andcommitted
arm64: dts: qcom: db820c: fix audio configuration
After patch f864edf ("ASoC: qdsp6: q6routing: remove default routing") and 9b60441 ("ASoC: qdsp6: q6asm-dai: only enable dais from device tree") asm dais and routing needs to be properly specified at device tree level. This patch fixes this. Tested-by: Vinod Koul <[email protected]> Reviewed-by: Vinod Koul <[email protected]> Signed-off-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 1724397 commit 7710f80

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,10 +908,27 @@
908908
status = "okay";
909909
};
910910

911+
&q6asmdai {
912+
dai@0 {
913+
reg = <0>;
914+
};
915+
916+
dai@1 {
917+
reg = <1>;
918+
};
919+
920+
dai@2 {
921+
reg = <2>;
922+
};
923+
};
924+
911925
&sound {
912926
compatible = "qcom,apq8096-sndcard";
913927
model = "DB820c";
914-
audio-routing = "RX_BIAS", "MCLK";
928+
audio-routing = "RX_BIAS", "MCLK",
929+
"MM_DL1", "MultiMedia1 Playback",
930+
"MM_DL2", "MultiMedia2 Playback",
931+
"MultiMedia3 Capture", "MM_UL3";
915932

916933
mm1-dai-link {
917934
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/msm8996.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,8 @@
20662066
reg = <APR_SVC_ASM>;
20672067
q6asmdai: dais {
20682068
compatible = "qcom,q6asm-dais";
2069+
#address-cells = <1>;
2070+
#size-cells = <0>;
20692071
#sound-dai-cells = <1>;
20702072
iommus = <&lpass_q6_smmu 1>;
20712073
};

0 commit comments

Comments
 (0)