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

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

Merge "ARM: dts: msm: Add max codec aux devs property for sm6150"

parents 3056c7e4 4d473cb3

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

+3 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,8 @@ Optional properties: 
- qcom,wsa-max-devs : Maximum number of WSA881x devices present in the target

- qcom,wsa-devs : List of phandles for all possible WSA881x devices supported for the target

- qcom,wsa-aux-dev-prefix : Name prefix with Left/Right configuration for WSA881x device

- qcom,codec-max-aux-devs: Maximum number of auxilary codecs present in the target

- qcom,codec-aux-devs: List of phandles for all possible auxilary codecs supprted for the target

- qcom,ext-disp-audio-rx: Property to specify if Audio over Display port is supported for the target

- 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
@@ -1624,6 +1626,7 @@ Example: 
				<&wsa881x_0213>, <&wsa881x_0214>;

		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

					  "SpkrLeft", "SpkrRight";

		qcom,codec-max-aux-devs = <1>;

		qcom,codec-aux-devs = <&wcd937x_codec>;

		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;

	};

arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 
			<&wsa881x_0213>, <&wsa881x_0214>;

	qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

				  "SpkrLeft", "SpkrRight";

	qcom,codec-max-aux-devs = <1>;

	qcom,codec-aux-devs = <&wcd937x_codec>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>,

				<&lpi_tlmm>, <&bolero>;