Merge "ASoC: msm: add support for VI sense recording" (3238c763) · Commits · e / devices / android_kernel_sony_msm8998

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

+1 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -187,11 +187,6 @@
		qcom,msm-dai-q6-dev-id = <16393>;
		};

		sb_4_tx_vi: qcom,msm-dai-q6-sb-4-tx-vi {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <20233>;
		};

		sb_5_tx: qcom,msm-dai-q6-sb-5-tx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <16395>;

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -105,8 +105,7 @@
		<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
		<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
		<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
		<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,
		<&sb_5_tx>,
		<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
		<&afe_proxy_tx>, <&incall_record_rx>,
		<&incall_record_tx>, <&incall_music_rx>,
		@@ -127,7 +126,6 @@
		"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
		"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
		"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
		"msm-dai-q6-dev.20233",
		"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
		"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
		"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
		@@ -239,8 +237,7 @@
		<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
		<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
		<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
		<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,
		<&sb_5_tx>,
		<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
		<&afe_proxy_tx>, <&incall_record_rx>,
		<&incall_record_tx>, <&incall_music_rx>,
		@@ -261,7 +258,6 @@
		"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
		"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
		"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
		"msm-dai-q6-dev.20233",
		"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
		"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
		"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

include/sound/apr_audio-v2.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -933,7 +933,6 @@ struct adm_cmd_connect_afe_port_v5 {
		#define SLIMBUS_3_TX 0x4007
		#define SLIMBUS_4_RX 0x4008
		#define SLIMBUS_4_TX 0x4009
		#define SLIMBUS_TX_VI 0x4f09
		#define SLIMBUS_5_RX 0x400a
		#define SLIMBUS_5_TX 0x400b
		#define SLIMBUS_6_RX 0x400c

sound/soc/msm/msm8998.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -2906,7 +2906,6 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		break;

		case MSM_BACKEND_DAI_SLIMBUS_4_TX:
		case MSM_BACKEND_DAI_SLIMBUS_TX_VI:
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		SNDRV_PCM_FORMAT_S32_LE);
		rate->min = rate->max = SAMPLING_RATE_8KHZ;
		@@ -3699,8 +3698,7 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream,
		/* For <codec>_tx3 case */
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX)
		user_set_tx_ch = slim_tx_cfg[1].channels;
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX \|\|
		dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_TX_VI)
		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX)
		user_set_tx_ch = msm_vi_feed_tx_ch;
		else
		user_set_tx_ch = tx_ch_cnt;
		@@ -5728,12 +5726,12 @@ static struct snd_soc_dai_link msm_tasha_be_dai_links[] = {
		/* Slimbus VI Recording */
		{
		.name = LPASS_BE_SLIMBUS_TX_VI,
		.stream_name = "Slimbus VI Capture",
		.cpu_dai_name = "msm-dai-q6-dev.20233",
		.stream_name = "Slimbus4 Capture",
		.cpu_dai_name = "msm-dai-q6-dev.16393",
		.platform_name = "msm-pcm-routing",
		.codec_name = "tasha_codec",
		.codec_dai_name = "tasha_vifeedback",
		.be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_be_ops,
		.ignore_suspend = 1,
		@@ -5913,16 +5911,15 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = {
		.ignore_pmdown_time = 1,
		.ignore_suspend = 1,
		},

		/* Slimbus VI Recording */
		{
		.name = LPASS_BE_SLIMBUS_TX_VI,
		.stream_name = "Slimbus VI Capture",
		.cpu_dai_name = "msm-dai-q6-dev.20233",
		.stream_name = "Slimbus4 Capture",
		.cpu_dai_name = "msm-dai-q6-dev.16393",
		.platform_name = "msm-pcm-routing",
		.codec_name = "tavil_codec",
		.codec_dai_name = "tavil_vifeedback",
		.be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,
		.be_hw_params_fixup = msm_be_hw_params_fixup,
		.ops = &msm_be_ops,
		.ignore_suspend = 1,

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+0 −32

Original line number	Diff line number	Diff line
		@@ -1773,7 +1773,6 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream,
		case SLIMBUS_2_TX:
		case SLIMBUS_3_TX:
		case SLIMBUS_4_TX:
		case SLIMBUS_TX_VI:
		case SLIMBUS_5_TX:
		case SLIMBUS_6_TX:
		case SLIMBUS_7_TX:
		@@ -1928,7 +1927,6 @@ static int msm_dai_q6_set_channel_map(struct snd_soc_dai *dai,
		case SLIMBUS_2_TX:
		case SLIMBUS_3_TX:
		case SLIMBUS_4_TX:
		case SLIMBUS_TX_VI:
		case SLIMBUS_5_TX:
		case SLIMBUS_6_TX:
		case SLIMBUS_7_TX:
		@@ -2347,9 +2345,6 @@ static const struct snd_kcontrol_new sb_config_controls[] = {
		msm_dai_q6_cal_info_get,
		msm_dai_q6_cal_info_put),
		SOC_ENUM_EXT("SLIM_2_RX Format", sb_config_enum[0],
		msm_dai_q6_sb_format_get,
		msm_dai_q6_sb_format_put),
		SOC_ENUM_EXT("SLIM_TX_VI Format", sb_config_enum[0],
		msm_dai_q6_sb_format_get,
		msm_dai_q6_sb_format_put)
		};
		@@ -2409,11 +2404,6 @@ static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai)
		snd_ctl_new1(&sb_config_controls[0],
		dai_data));
		break;
		case SLIMBUS_TX_VI:
		rc = snd_ctl_add(dai->component->card->snd_card,
		snd_ctl_new1(&sb_config_controls[3],
		dai_data));
		break;
		case SLIMBUS_2_RX:
		rc = snd_ctl_add(dai->component->card->snd_card,
		snd_ctl_new1(&sb_config_controls[1],
		@@ -3300,25 +3290,6 @@ static struct snd_soc_dai_driver msm_dai_q6_slimbus_tx_dai[] = {
		.probe = msm_dai_q6_dai_probe,
		.remove = msm_dai_q6_dai_remove,
		},
		{
		.capture = {
		.stream_name = "Slimbus VI Capture",
		.aif_name = "SLIMBUS_TX_VI",
		.rates = SNDRV_PCM_RATE_8000_96000 \|
		SNDRV_PCM_RATE_192000,
		.formats = SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE \|
		SNDRV_PCM_FMTBIT_S32_LE,
		.channels_min = 1,
		.channels_max = 4,
		.rate_min = 8000,
		.rate_max = 192000,
		},
		.ops = &msm_dai_q6_ops,
		.id = SLIMBUS_TX_VI,
		.probe = msm_dai_q6_dai_probe,
		.remove = msm_dai_q6_dai_remove,
		},
		{
		.capture = {
		.stream_name = "Slimbus5 Capture",
		@@ -4677,9 +4648,6 @@ register_slim_playback:
		case SLIMBUS_4_TX:
		strlcpy(stream_name, "Slimbus4 Capture", 80);
		goto register_slim_capture;
		case SLIMBUS_TX_VI:
		strlcpy(stream_name, "Slimbus VI Capture", 80);
		goto register_slim_capture;
		case SLIMBUS_5_TX:
		strlcpy(stream_name, "Slimbus5 Capture", 80);
		goto register_slim_capture;