Skip to content
This repository has been archived by the owner on Mar 15, 2022. It is now read-only.

Commit

Permalink
arm64: dts: qcom: db820c: fix audio configuration
Browse files Browse the repository at this point in the history
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 <vkoul@kernel.org>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200422101922.8894-1-srinivas.kandagatla@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

[ upstream commit: 7710f80 ]
  • Loading branch information
Srinivas-Kandagatla authored and andersson committed Apr 23, 2020
1 parent bb0c1cc commit 55ff6a8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
19 changes: 18 additions & 1 deletion src/arm64/qcom/apq8096-db820c.dtsi
Expand Up @@ -908,10 +908,27 @@
status = "okay";
};

&q6asmdai {
dai@0 {
reg = <0>;
};

dai@1 {
reg = <1>;
};

dai@2 {
reg = <2>;
};
};

&sound {
compatible = "qcom,apq8096-sndcard";
model = "DB820c";
audio-routing = "RX_BIAS", "MCLK";
audio-routing = "RX_BIAS", "MCLK",
"MM_DL1", "MultiMedia1 Playback",
"MM_DL2", "MultiMedia2 Playback",
"MultiMedia3 Capture", "MM_UL3";

mm1-dai-link {
link-name = "MultiMedia1";
Expand Down
2 changes: 2 additions & 0 deletions src/arm64/qcom/msm8996.dtsi
Expand Up @@ -2066,6 +2066,8 @@
reg = <APR_SVC_ASM>;
q6asmdai: dais {
compatible = "qcom,q6asm-dais";
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <1>;
iommus = <&lpass_q6_smmu 1>;
};
Expand Down

0 comments on commit 55ff6a8

Please sign in to comment.