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

Commit fcc10f60 authored by Cong Tang's avatar Cong Tang Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Add Tert Mi2s Group node for msm8996 



Support tertiary mi2s group device feature for msm8996.

Change-Id: Ifb0cf8fae13961bef6938cc6f99ecbd5740b2985
Signed-off-by: default avatarCong Tang <congt@codeaurora.org>
parent e46bc1b0

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

+104 −0
Original line number Diff line number Diff line
@@ -2678,3 +2678,107 @@ Example 2: 
		qcom,spkr-tdm-rx = <&dai_quat_tdm_rx_0>;

		qcom,mic-tdm-tx = <&dai_quat_tdm_tx_0>;

	};



* msm-dai-group-mi2s



[First Level Nodes]



Required properties:



 - compatible : "qcom,msm-dai-group-mi2s"

 - qcom,msm-cpudai-mi2s-group-id: ID of the group device. MI2S interface

				supports up to 8 groups:

				Secondary RX: 	4354

				Secondary TX: 	4355

				Tertiary RX: 	4356

				Tertiary TX: 	4357

				Quaternary RX: 	4358

				Quaternary TX: 	4359



 - qcom,msm-cpudai-mi2s-group-num-ports: Number of ports in

				msm-cpudai-mi2s-group-port-id array.

				Max number of ports supported by DSP is 8.



 - qcom,msm-cpudai-mi2s-group-port-id: Array of mi2s port IDs of the group.

				The size of the array is determined by

				the value in msm-cpudai-mi2s-group-num-ports.

				Each group supports up to 4 ports:

				Secondary RX: 	4160, 4162, 4164, 4174,

				Secondary TX:	4161, 4163, 4165, 4175,

				Tertiary RX: 	4168, 4170, 4172, 4176,

				Tertiary TX: 	4169, 4171, 4173, 4177,

				Quaternary RX:	4102, 4128, 4130, 4132,

				Quaternary TX:	4103, 4129, 4131, 4133,



 - qcom,msm-cpudai-mi2s-channel-mode: group mi2s line channel mode.

				I2S_SD0    :                  0x1

				I2S_SD1    :                  0x2

				I2S_SD2    :                  0x3

				I2S_SD3    :                  0x4

				I2S_QUAD01 :                  0x5

				I2S_QUAD23 :                  0x6

				I2S_6CHS   :                  0x7

				I2S_8CHS   :                  0x8



 - qcom,msm-cpudai-mi2s-sync-mode: group mi2s master mode.

				0 - Slave

				1 - Master



 - qcom,msm-cpudai-mi2s-mclk: mi2s mclk value if required.

				0 - not provided any mclk

				others - the real mclk value, at least

				equal with bclk.



 - qcom,msm-cpudai-mi2s-bclk: mi2s bclk value required, the clk value should

				equal channels * bit_width * rate.



 [Second Level Nodes]



Required properties:



 - compatible : "qcom,msm-dai-group-mi2s-dev"

 - qcom,msm-dai-q6-mi2s-dev-id: mi2s port ID.

 - qcom,msm-cpudai-mi2s-channel-mode:  mi2s port line channel mode

				I2S_SD0    :                  0x1

				I2S_SD1    :                  0x2

				I2S_SD2    :                  0x3

				I2S_SD3    :                  0x4

				I2S_QUAD01 :                  0x5

				I2S_QUAD23 :                  0x6

				I2S_6CHS   :                  0x7

				I2S_8CHS   :                  0x8



 - qcom,msm-cpudai-mi2s-data-align: Indicate how data is packed

				within the slot. For example, 32 slot width in case of

				sample bit width is 24.

				0 - MSB

				1 - LSB



Optional properties:



 - pinctrl-names: Pinctrl state names for each pin group

				configuration.



 - pinctrl-x: Defines pinctrl state for each pin group.



Example:

    qcom,msm-dai-group-mi2s-tert-tx {

        compatible = "qcom,msm-dai-group-mi2s";

        qcom,msm-cpudai-mi2s-group-id = <4357>;

		qcom,msm-cpudai-mi2s-group-num-ports = <2>;

        qcom,msm-cpudai-mi2s-group-port-id = <4167 4169>;

	    qcom,msm-cpudai-mi2s-channel-mode = <5>;

        dai_tert_mi2s_tx_1:qcom,msm-dai-q6-mi2s-tert-tx-1 {

            compatible = "qcom,msm-dai-group-mi2s-dev";

            qcom,msm-cpudai-mi2s-dev-id = <4167>;

            qcom,msm-cpudai-mi2s-dev-channel-mode = <1>;

			qcom,msm-cpudai-mi2s-data-align = <0>;

        };



        dai_tert_mi2s_tx_2:qcom,msm-dai-q6-mi2s-tert-tx-2 {

            compatible = "qcom,msm-dai-group-mi2s-dev";

            qcom,msm-cpudai-mi2s-dev-id = <4169>;

            qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;

			qcom,msm-cpudai-mi2s-data-align = <0>;

        };

    };

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -729,7 +729,19 @@ 
				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,

				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_2>,

				<&dai_quat_tdm_tx_3>;

				<&dai_quat_tdm_tx_3>, <&dai_sec_mi2s_rx_1>,

				<&dai_sec_mi2s_rx_2>, <&dai_sec_mi2s_rx_3>,

				<&dai_sec_mi2s_rx_4>, <&dai_sec_mi2s_tx_1>,

				<&dai_sec_mi2s_tx_2>, <&dai_sec_mi2s_tx_3>,

				<&dai_sec_mi2s_tx_4>, <&dai_tert_mi2s_rx_1>,

				<&dai_tert_mi2s_rx_2>, <&dai_tert_mi2s_rx_3>,

				<&dai_tert_mi2s_rx_4>, <&dai_tert_mi2s_tx_1>,

				<&dai_tert_mi2s_tx_2>, <&dai_tert_mi2s_tx_3>,

				<&dai_tert_mi2s_tx_4>, <&dai_quat_mi2s_rx_1>,

				<&dai_quat_mi2s_rx_2>, <&dai_quat_mi2s_rx_3>,

				<&dai_quat_mi2s_rx_4>, <&dai_quat_mi2s_tx_1>,

				<&dai_quat_mi2s_tx_2>, <&dai_quat_mi2s_tx_3>,

				<&dai_quat_mi2s_tx_4>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -753,7 +765,19 @@ 
				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",

				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",

				"msm-dai-q6-tdm.36919";

				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",

				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",

				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",

				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",

				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",

				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",

				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",

				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",

				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",

				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",

				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",

				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

				"msm-dai-q6-mi2s.4135";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

	};

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,19 @@ 
				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,

				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_2>,

				<&dai_quat_tdm_tx_3>;

				<&dai_quat_tdm_tx_3>, <&dai_sec_mi2s_rx_1>,

				<&dai_sec_mi2s_rx_2>, <&dai_sec_mi2s_rx_3>,

				<&dai_sec_mi2s_rx_4>, <&dai_sec_mi2s_tx_1>,

				<&dai_sec_mi2s_tx_2>, <&dai_sec_mi2s_tx_3>,

				<&dai_sec_mi2s_tx_4>, <&dai_tert_mi2s_rx_1>,

				<&dai_tert_mi2s_rx_2>, <&dai_tert_mi2s_rx_3>,

				<&dai_tert_mi2s_rx_4>, <&dai_tert_mi2s_tx_1>,

				<&dai_tert_mi2s_tx_2>, <&dai_tert_mi2s_tx_3>,

				<&dai_tert_mi2s_tx_4>, <&dai_quat_mi2s_rx_1>,

				<&dai_quat_mi2s_rx_2>, <&dai_quat_mi2s_rx_3>,

				<&dai_quat_mi2s_rx_4>, <&dai_quat_mi2s_tx_1>,

				<&dai_quat_mi2s_tx_2>, <&dai_quat_mi2s_tx_3>,

				<&dai_quat_mi2s_tx_4>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -1130,7 +1142,19 @@ 
				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",

				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",

				"msm-dai-q6-tdm.36919";

				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",

				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",

				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",

				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",

				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",

				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",

				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",

				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",

				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",

				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",

				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",

				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

				"msm-dai-q6-mi2s.4135";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

	};

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -959,7 +959,19 @@ 
				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,

				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_2>,

				<&dai_quat_tdm_tx_3>;

				<&dai_quat_tdm_tx_3>, <&dai_sec_mi2s_rx_1>,

				<&dai_sec_mi2s_rx_2>, <&dai_sec_mi2s_rx_3>,

				<&dai_sec_mi2s_rx_4>, <&dai_sec_mi2s_tx_1>,

				<&dai_sec_mi2s_tx_2>, <&dai_sec_mi2s_tx_3>,

				<&dai_sec_mi2s_tx_4>, <&dai_tert_mi2s_rx_1>,

				<&dai_tert_mi2s_rx_2>, <&dai_tert_mi2s_rx_3>,

				<&dai_tert_mi2s_rx_4>, <&dai_tert_mi2s_tx_1>,

				<&dai_tert_mi2s_tx_2>, <&dai_tert_mi2s_tx_3>,

				<&dai_tert_mi2s_tx_4>, <&dai_quat_mi2s_rx_1>,

				<&dai_quat_mi2s_rx_2>, <&dai_quat_mi2s_rx_3>,

				<&dai_quat_mi2s_rx_4>, <&dai_quat_mi2s_tx_1>,

				<&dai_quat_mi2s_tx_2>, <&dai_quat_mi2s_tx_3>,

				<&dai_quat_mi2s_tx_4>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -983,7 +995,19 @@ 
				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",

				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",

				"msm-dai-q6-tdm.36919";

				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",

				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",

				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",

				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",

				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",

				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",

				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",

				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",

				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",

				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",

				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",

				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

				"msm-dai-q6-mi2s.4135";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

	};

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -554,7 +554,19 @@ 
				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,

				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_tx_0>,

				<&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_2>,

				<&dai_quat_tdm_tx_3>;

				<&dai_quat_tdm_tx_3>, <&dai_sec_mi2s_rx_1>,

				<&dai_sec_mi2s_rx_2>, <&dai_sec_mi2s_rx_3>,

				<&dai_sec_mi2s_rx_4>, <&dai_sec_mi2s_tx_1>,

				<&dai_sec_mi2s_tx_2>, <&dai_sec_mi2s_tx_3>,

				<&dai_sec_mi2s_tx_4>, <&dai_tert_mi2s_rx_1>,

				<&dai_tert_mi2s_rx_2>, <&dai_tert_mi2s_rx_3>,

				<&dai_tert_mi2s_rx_4>, <&dai_tert_mi2s_tx_1>,

				<&dai_tert_mi2s_tx_2>, <&dai_tert_mi2s_tx_3>,

				<&dai_tert_mi2s_tx_4>, <&dai_quat_mi2s_rx_1>,

				<&dai_quat_mi2s_rx_2>, <&dai_quat_mi2s_rx_3>,

				<&dai_quat_mi2s_rx_4>, <&dai_quat_mi2s_tx_1>,

				<&dai_quat_mi2s_tx_2>, <&dai_quat_mi2s_tx_3>,

				<&dai_quat_mi2s_tx_4>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -578,7 +590,19 @@ 
				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",

				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",

				"msm-dai-q6-tdm.36919";

				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",

				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",

				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",

				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",

				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",

				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",

				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",

				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",

				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",

				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",

				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",

				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

				"msm-dai-q6-mi2s.4135";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

	};