Merge "ASoC: msmcobalt: Add support for all TDM modes" (a8a45f5f) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/msm-audio-lpass.dtsi

+108 −2

Original line number	Diff line number	Diff line
		@@ -371,13 +371,84 @@
		qcom,adsp-state = <0>;
		};

		qcom,msm-dai-tdm-pri-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37120>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36864>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36864>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-pri-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37121>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36865>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36865>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-sec-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37136>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36880>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36880>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-sec-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37137>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36881>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36881>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-tert-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37152>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36896>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		pinctrl-names = "default", "sleep";
		dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36896>;
		@@ -396,7 +467,6 @@
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36897 >;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		pinctrl-names = "default", "sleep";
		dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36897 >;
		@@ -408,4 +478,40 @@
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-quat-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37168>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36912>;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_quat_tdm_rx_0: qcom,msm-dai-q6-tdm-quat-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36912>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-quat-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37169>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36913 >;
		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
		dai_quat_tdm_tx_0: qcom,msm-dai-q6-tdm-quat-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36913 >;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <1>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};
		};

arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi

+16 −4

Original line number	Diff line number	Diff line
		@@ -108,7 +108,10 @@
		<&incall_music_2_rx>, <&sb_5_rx>, <&sb_6_rx>,
		<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,
		<&usb_audio_rx>, <&usb_audio_tx>,
		<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>;
		<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
		<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
		<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
		<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;
		asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dp.24608",
		"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		@@ -127,7 +130,10 @@
		"msm-dai-q6-dev.16396", "msm-dai-q6-dev.16398",
		"msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401",
		"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",
		"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897";
		"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",
		"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
		"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",
		"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";
		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		"msm-ext-disp-audio-codec-rx";
		@@ -213,7 +219,10 @@
		<&incall_music_2_rx>, <&sb_5_rx>, <&sb_6_rx>,
		<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,
		<&usb_audio_rx>, <&usb_audio_tx>,
		<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>;
		<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
		<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
		<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
		<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;
		asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dp.24608",
		"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		@@ -232,7 +241,10 @@
		"msm-dai-q6-dev.16396", "msm-dai-q6-dev.16398",
		"msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401",
		"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",
		"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897";
		"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",
		"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
		"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",
		"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";
		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		"msm-ext-disp-audio-codec-rx";

sound/soc/msm/msmcobalt.c

+186 −0

Original line number	Diff line number	Diff line
		@@ -2369,6 +2369,42 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		SOC_ENUM_EXT("Display Port RX SampleRate", ext_disp_rx_sample_rate,
		ext_disp_rx_sample_rate_get,
		ext_disp_rx_sample_rate_put),
		SOC_ENUM_EXT("PRI_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
		tdm_rx_sample_rate_get,
		tdm_rx_sample_rate_put),
		SOC_ENUM_EXT("PRI_TDM_TX_0 SampleRate", tdm_tx_sample_rate,
		tdm_tx_sample_rate_get,
		tdm_tx_sample_rate_put),
		SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,
		tdm_rx_format_get,
		tdm_rx_format_put),
		SOC_ENUM_EXT("PRI_TDM_TX_0 Format", tdm_tx_format,
		tdm_tx_format_get,
		tdm_tx_format_put),
		SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,
		tdm_rx_ch_get,
		tdm_rx_ch_put),
		SOC_ENUM_EXT("PRI_TDM_TX_0 Channels", tdm_tx_chs,
		tdm_tx_ch_get,
		tdm_tx_ch_put),
		SOC_ENUM_EXT("SEC_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
		tdm_rx_sample_rate_get,
		tdm_rx_sample_rate_put),
		SOC_ENUM_EXT("SEC_TDM_TX_0 SampleRate", tdm_tx_sample_rate,
		tdm_tx_sample_rate_get,
		tdm_tx_sample_rate_put),
		SOC_ENUM_EXT("SEC_TDM_RX_0 Format", tdm_rx_format,
		tdm_rx_format_get,
		tdm_rx_format_put),
		SOC_ENUM_EXT("SEC_TDM_TX_0 Format", tdm_tx_format,
		tdm_tx_format_get,
		tdm_tx_format_put),
		SOC_ENUM_EXT("SEC_TDM_RX_0 Channels", tdm_rx_chs,
		tdm_rx_ch_get,
		tdm_rx_ch_put),
		SOC_ENUM_EXT("SEC_TDM_TX_0 Channels", tdm_tx_chs,
		tdm_tx_ch_get,
		tdm_tx_ch_put),
		SOC_ENUM_EXT("TERT_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
		tdm_rx_sample_rate_get,
		tdm_rx_sample_rate_put),
		@@ -2387,6 +2423,24 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		SOC_ENUM_EXT("TERT_TDM_TX_0 Channels", tdm_tx_chs,
		tdm_tx_ch_get,
		tdm_tx_ch_put),
		SOC_ENUM_EXT("QUAT_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
		tdm_rx_sample_rate_get,
		tdm_rx_sample_rate_put),
		SOC_ENUM_EXT("QUAT_TDM_TX_0 SampleRate", tdm_tx_sample_rate,
		tdm_tx_sample_rate_get,
		tdm_tx_sample_rate_put),
		SOC_ENUM_EXT("QUAT_TDM_RX_0 Format", tdm_rx_format,
		tdm_rx_format_get,
		tdm_rx_format_put),
		SOC_ENUM_EXT("QUAT_TDM_TX_0 Format", tdm_tx_format,
		tdm_tx_format_get,
		tdm_tx_format_put),
		SOC_ENUM_EXT("QUAT_TDM_RX_0 Channels", tdm_rx_chs,
		tdm_rx_ch_get,
		tdm_rx_ch_put),
		SOC_ENUM_EXT("QUAT_TDM_TX_0 Channels", tdm_tx_chs,
		tdm_tx_ch_get,
		tdm_tx_ch_put),
		SOC_ENUM_EXT("PRIM_AUX_PCM_RX SampleRate", prim_aux_pcm_rx_sample_rate,
		aux_pcm_rx_sample_rate_get,
		aux_pcm_rx_sample_rate_put),
		@@ -2758,6 +2812,38 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		rate->min = rate->max = SAMPLING_RATE_48KHZ;
		break;

		case MSM_BACKEND_DAI_PRI_TDM_RX_0:
		channels->min = channels->max =
		tdm_rx_cfg[TDM_PRI][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_rx_cfg[TDM_PRI][TDM_0].bit_format);
		rate->min = rate->max = tdm_rx_cfg[TDM_PRI][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_PRI_TDM_TX_0:
		channels->min = channels->max =
		tdm_tx_cfg[TDM_PRI][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_tx_cfg[TDM_PRI][TDM_0].bit_format);
		rate->min = rate->max = tdm_tx_cfg[TDM_PRI][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_SEC_TDM_RX_0:
		channels->min = channels->max =
		tdm_rx_cfg[TDM_SEC][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_rx_cfg[TDM_SEC][TDM_0].bit_format);
		rate->min = rate->max = tdm_rx_cfg[TDM_SEC][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_SEC_TDM_TX_0:
		channels->min = channels->max =
		tdm_tx_cfg[TDM_SEC][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_tx_cfg[TDM_SEC][TDM_0].bit_format);
		rate->min = rate->max = tdm_tx_cfg[TDM_SEC][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_TERT_TDM_RX_0:
		channels->min = channels->max =
		tdm_rx_cfg[TDM_TERT][TDM_0].channels;
		@@ -2774,6 +2860,22 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		rate->min = rate->max = tdm_tx_cfg[TDM_TERT][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_QUAT_TDM_RX_0:
		channels->min = channels->max =
		tdm_rx_cfg[TDM_QUAT][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_rx_cfg[TDM_QUAT][TDM_0].bit_format);
		rate->min = rate->max = tdm_rx_cfg[TDM_QUAT][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_QUAT_TDM_TX_0:
		channels->min = channels->max =
		tdm_tx_cfg[TDM_QUAT][TDM_0].channels;
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		tdm_tx_cfg[TDM_QUAT][TDM_0].bit_format);
		rate->min = rate->max = tdm_tx_cfg[TDM_QUAT][TDM_0].sample_rate;
		break;

		case MSM_BACKEND_DAI_AUXPCM_RX:
		rate->min = rate->max =
		aux_pcm_rx_cfg[PRIM_AUX_PCM].sample_rate;
		@@ -4846,6 +4948,62 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_PRI_TDM_RX_0,
		.stream_name = "Primary TDM0 Playback",
		.cpu_dai_name = "msm-dai-q6-tdm.36864",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-rx",
		.no_pcm = 1,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_PRI_TDM_RX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_PRI_TDM_TX_0,
		.stream_name = "Primary TDM0 Capture",
		.cpu_dai_name = "msm-dai-q6-tdm.36865",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-tx",
		.no_pcm = 1,
		.dpcm_capture = 1,
		.be_id = MSM_BACKEND_DAI_PRI_TDM_TX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_SEC_TDM_RX_0,
		.stream_name = "Secondary TDM0 Playback",
		.cpu_dai_name = "msm-dai-q6-tdm.36880",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-rx",
		.no_pcm = 1,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_SEC_TDM_RX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_SEC_TDM_TX_0,
		.stream_name = "Secondary TDM0 Capture",
		.cpu_dai_name = "msm-dai-q6-tdm.36881",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-tx",
		.no_pcm = 1,
		.dpcm_capture = 1,
		.be_id = MSM_BACKEND_DAI_SEC_TDM_TX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_TERT_TDM_RX_0,
		.stream_name = "Tertiary TDM0 Playback",
		@@ -4874,6 +5032,34 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_QUAT_TDM_RX_0,
		.stream_name = "Quaternary TDM0 Playback",
		.cpu_dai_name = "msm-dai-q6-tdm.36912",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-rx",
		.no_pcm = 1,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_QUAT_TDM_RX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_QUAT_TDM_TX_0,
		.stream_name = "Quaternary TDM0 Capture",
		.cpu_dai_name = "msm-dai-q6-tdm.36913",
		.platform_name = "msm-pcm-routing",
		.codec_name = "msm-stub-codec.1",
		.codec_dai_name = "msm-stub-tx",
		.no_pcm = 1,
		.dpcm_capture = 1,
		.be_id = MSM_BACKEND_DAI_QUAT_TDM_TX_0,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_tdm_be_ops,
		.ignore_suspend = 1,
		},
		};

		static struct snd_soc_dai_link msm_tasha_be_dai_links[] = {