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

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

Merge "ASoC: msm: qdsp6v2: Add support for multiple slots in auxpcm data"

parents b6bdf60e e3727e98

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

+17 −5
Original line number Diff line number Diff line
@@ -197,10 +197,21 @@ Required properties: 
                                          is for 16khz

                                          2 - Linear quantization



 - qcom,msm-cpudai-auxpcm-slot:           Slot number for multichannel scenario

                                          The first value is for 8khz mode the

                                          second is for 16khz

                                          Value is 1

 - qcom,msm-cpudai-auxpcm-num-slots:      Number of slots per mode in the

                                          msm-cpudai-auxpcm-slot-mapping

                                          array.

                                          The first value is for 8khz mode, the

                                          second is for 16khz. Max number of

                                          slots supported by DSP is 4, anything

                                          above 4 will be truncated to 4 when

                                          sent to DSP.



 - qcom,msm-cpudai-auxpcm-slot-mapping:   Array of slot numbers for multi

                                          slot scenario. The first array

                                          is for 8khz mode, the second is

                                          for 16khz. The size of the array

                                          is determined by the value in

                                          qcom,msm-cpudai-auxpcm-num-slots



 - qcom,msm-cpudai-auxpcm-data:           Data field - 0. The first value is

                                          for 8khz mode, the second is for
@@ -458,7 +469,8 @@ Example: 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <4>, <4>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1 0 0 0>, <1 3 0 0>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";

arch/arm/boot/dts/qcom/apq8084.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -3665,7 +3665,8 @@ 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";
@@ -3677,7 +3678,8 @@ 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "secondary";

arch/arm/boot/dts/qcom/mdm9630.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,8 @@ 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";

arch/arm/boot/dts/qcom/msm8226.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";

arch/arm/boot/dts/qcom/msm8916.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -999,7 +999,8 @@ 
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "primary";