Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c437ac84 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add dai links only when supported"

parents f517cf41 a7df4289

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+2 −0
Original line number Diff line number Diff line
@@ -2042,6 +2042,7 @@ Optional properties: 
- qcom,wcn-btfm : Property to specify if WCN BT/FM chip is used for the target

- qcom,mi2s-audio-intf: Property to specify if MI2S interface is used for the target

- qcom,auxpcm-audio-intf: Property to specify if Aux PCM interface is used for the target

- qcom,tdm-audio-intf: Property to specify if Aux PCM interface is used for the target

- qcom,cdc-dmic-gpios : phandle for Digital mic clk and data gpios.

- qcom,msm_audio_ssr_devs: List the snd event framework clients

- qcom,afe-rxtx-lb: AFE RX to TX loopback.
@@ -2054,6 +2055,7 @@ Example: 
		qcom,wcn-btfm = <1>;

		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,tdm-audio-intf = <1>;

		qcom,afe-rxtx-lb = <1>;



		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

arch/arm64/boot/dts/qcom/atoll-audio.dtsi

+4 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -86,8 +86,9 @@ 
&q6core {

	atoll_snd: sound {

		compatible = "qcom,kona-asoc-snd";

		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,mi2s-audio-intf = <0>;

		qcom,auxpcm-audio-intf = <0>;

		qcom,tdm-audio-intf = <0>;

		qcom,wcn-btfm = <1>;

		qcom,ext-disp-audio-rx = <1>;

		qcom,afe-rxtx-lb = <0>;