arm64: dts: qcom: db820c: fix audio configuration (7710f80e) · Commits · 戴 / test

After patch ("ASoC: qdsp6: q6routing: remove default routing") and ("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>

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -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";

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>;
		};

Admin message