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

Commit b4012e46 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add Incall recording support in APQ8084"

parents 4bd15ca9 a4c2acc4

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

+11 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ Required properties: 


 - compatible : "qcom,msm-dai-q6-dev"

 - qcom,msm-dai-q6-dev-id : The slimbus multi channel port ID

                            Value is from 16384 to 16393

                            Value is from 16384 to 16397

                            BT SCO port ID value from 12288 to 12289

                            RT Proxy port ID values from 224 to 225 and 240 to

			    241
@@ -329,6 +329,16 @@ Example: 
			qcom,msm-dai-q6-dev-id = <16393>;

		};



		qcom,msm-dai-q6-sb-6-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16396>;

		};



		qcom,msm-dai-q6-sb-6-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16397>;

		};



		qcom,msm-dai-q6-bt-sco-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12288>;

arch/arm/boot/dts/apq8084.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -2426,6 +2426,16 @@ 
			qcom,msm-dai-q6-dev-id = <16395>;

		};



		qcom,msm-dai-q6-sb-6-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16396>;

		};



		qcom,msm-dai-q6-sb-6-tx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <16397>;

		};



		qcom,msm-dai-q6-bt-sco-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <12288>;