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

Commit 649c0ba7 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: add support for secondary MI2S TX hostless capture"

parents 4519d4da 8c05e36f

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

+12 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -696,7 +696,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

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

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

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

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -728,6 +728,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

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

+4 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -971,7 +971,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

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

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

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

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -1003,6 +1003,8 @@ 


	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

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

+12 −2
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -816,7 +816,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

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

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

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

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -862,6 +862,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

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

+12 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -547,7 +547,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

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

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

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

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -571,6 +571,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

sound/soc/msm/apq8096-auto.c

+122 −4
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ static int msm_auxpcm_rate = SAMPLING_RATE_8KHZ; 
static int msm_hdmi_rx_ch = 2;

static int msm_proxy_rx_ch = 2;

static int hdmi_rx_sample_rate = SAMPLING_RATE_48KHZ;

static int msm_sec_mi2s_tx_ch = 2;

static int msm_tert_mi2s_tx_ch = 2;

static int msm_quat_mi2s_rx_ch = 2;

static int msm_sec_mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int msm_tert_mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int msm_quat_mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
@@ -260,6 +262,15 @@ static char const *ec_ref_bit_format_text[] = {"0", "S16_LE", "S24_LE"}; 
static const char *const ec_ref_rate_text[] = {"0", "8000", "16000",

	"32000", "44100", "48000", "96000", "192000", "384000"};



static struct afe_clk_set sec_mi2s_tx_clk = {

	AFE_API_VERSION_I2S_CONFIG,

	Q6AFE_LPASS_CLK_ID_SEC_MI2S_EBIT,

	Q6AFE_LPASS_IBIT_CLK_DISABLE,

	Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,

	Q6AFE_LPASS_CLK_ROOT_DEFAULT,

	0,

};



static struct afe_clk_set mi2s_tx_clk = {

	AFE_API_VERSION_I2S_CONFIG,

	Q6AFE_LPASS_CLK_ID_TER_MI2S_EBIT,
@@ -526,6 +537,40 @@ static int msm_tert_mi2s_tx_bit_format_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int msm_sec_mi2s_tx_bit_format_get(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	switch (msm_sec_mi2s_tx_bit_format) {

	case SNDRV_PCM_FORMAT_S24_LE:

		ucontrol->value.integer.value[0] = 1;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	default:

		ucontrol->value.integer.value[0] = 0;

		break;

	}

	pr_debug("%s: msm_sec_mi2s_tx_bit_format = %ld\n",

		 __func__, ucontrol->value.integer.value[0]);

	return 0;

}



static int msm_sec_mi2s_tx_bit_format_put(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	switch (ucontrol->value.integer.value[0]) {

	case 1:

		msm_sec_mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;

	case 0:

	default:

		msm_sec_mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

		break;

	}

	pr_debug("%s: msm_sec_mi2s_tx_bit_format = %d\n",

		 __func__, msm_sec_mi2s_tx_bit_format);

	return 0;

}



static int msm_tert_tdm_rx_0_ch_get(struct snd_kcontrol *kcontrol,

			       struct snd_ctl_elem_value *ucontrol)

{
@@ -1548,16 +1593,39 @@ static int msm_mi2s_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
static int msm_mi2s_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				     struct snd_pcm_hw_params *params)

{

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_interval *rate = hw_param_interval(params,

					SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

					SNDRV_PCM_HW_PARAM_CHANNELS);



	switch (cpu_dai->id) {

	case 0:	/*MSM_PRIM_MI2S*/

		break;

	case 1:	/*MSM_SEC_MI2S*/

		pr_debug("%s: channel:%d\n", __func__, msm_sec_mi2s_tx_ch);

		channels->min = channels->max = msm_sec_mi2s_tx_ch;

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			msm_sec_mi2s_tx_bit_format);

		break;

	case 2:	/*MSM_TERT_MI2S*/

		pr_debug("%s: channel:%d\n", __func__, msm_tert_mi2s_tx_ch);

	rate->min = rate->max = SAMPLING_RATE_48KHZ;

		channels->min = channels->max = msm_tert_mi2s_tx_ch;

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			msm_tert_mi2s_tx_bit_format);

		break;

	case 3:	/*MSM_QUAT_MI2S*/

		break;

	default:

		pr_err("%s: dai id 0x%x not supported\n",

			__func__, cpu_dai->id);

		return -EINVAL;

	}

	rate->min = rate->max = SAMPLING_RATE_48KHZ;



	pr_debug("%s: dai id = 0x%x channels = %d rate = %d format = 0x%x\n",

		__func__, cpu_dai->id, channels->max, rate->max,

		params_format(params));



	return 0;

}
@@ -1690,6 +1758,18 @@ static int apq8096_mi2s_snd_startup(struct snd_pcm_substream *substream) 
	case 0:	/*MSM_PRIM_MI2S*/

		break;

	case 1:	/*MSM_SEC_MI2S*/

		sec_mi2s_tx_clk.enable = 1;

		ret = afe_set_lpass_clock_v2(AFE_PORT_ID_SECONDARY_MI2S_TX,

					&sec_mi2s_tx_clk);

		if (ret < 0) {

			pr_err("%s: afe lpass clock failed, err:%d\n",

				__func__, ret);

			goto err;

		}

		ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM);

		if (ret < 0)

			pr_err("%s: set fmt cpu dai failed, err:%d\n",

				__func__, ret);

		break;

	case 2:	/*MSM_TERT_MI2S*/

		mi2s_tx_clk.enable = 1;
@@ -1741,6 +1821,12 @@ static void apq8096_mi2s_snd_shutdown(struct snd_pcm_substream *substream) 
	case 0:	/*MSM_PRIM_MI2S*/

		break;

	case 1:	/*MSM_SEC_MI2S*/

		sec_mi2s_tx_clk.enable = 0;

		ret = afe_set_lpass_clock_v2(AFE_PORT_ID_SECONDARY_MI2S_TX,

					&sec_mi2s_tx_clk);

		if (ret < 0)

			pr_err("%s: afe lpass clock failed, err:%d\n",

				__func__, ret);

		break;

	case 2:	/*MSM_TERT_MI2S*/

		mi2s_tx_clk.enable = 0;
@@ -2107,6 +2193,9 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
	SOC_ENUM_EXT("TERT_MI2S_TX Bit Format", msm_snd_enum[7],

			msm_tert_mi2s_tx_bit_format_get,

			msm_tert_mi2s_tx_bit_format_put),

	SOC_ENUM_EXT("SEC_MI2S_TX Bit Format", msm_snd_enum[7],

			msm_sec_mi2s_tx_bit_format_get,

			msm_sec_mi2s_tx_bit_format_put),

	SOC_ENUM_EXT("EC Reference Channels", msm_snd_enum[8],

			msm_ec_ref_ch_get, msm_ec_ref_ch_put),

	SOC_ENUM_EXT("EC Reference Bit Format", msm_snd_enum[9],
@@ -3096,6 +3185,21 @@ static struct snd_soc_dai_link apq8096_auto_fe_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "Secondary MI2S_TX Hostless Capture",

		.stream_name = "Secondary MI2S_TX Hostless Capture",

		.cpu_dai_name = "SEC_MI2S_TX_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

};



static struct snd_soc_dai_link apq8096_common_be_dai_links[] = {
@@ -3217,6 +3321,20 @@ static struct snd_soc_dai_link apq8096_common_be_dai_links[] = { 


static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = {

	/* Backend DAI Links */

	{

		.name = LPASS_BE_SEC_MI2S_TX,

		.stream_name = "Secondary MI2S Capture",

		.cpu_dai_name = "msm-dai-q6-mi2s.1",

		.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_SECONDARY_MI2S_TX,

		.be_hw_params_fixup = msm_mi2s_tx_be_hw_params_fixup,

		.ops = &apq8096_mi2s_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_TERT_MI2S_TX,

		.stream_name = "Tertiary MI2S Capture",