Merge "ASoC: msm8996: Add slimbus_6_rx back-end dai-link and hostless" (6fd87ace) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -2935,7 +2935,7 @@
		<&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
		<&incall_record_rx>, <&incall_record_tx>,
		<&incall_music_rx>, <&incall_music2_rx>,
		<&sb_5_rx>;
		<&sb_5_rx>, <&sb_6_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
		"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.2",
		"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
		@@ -2947,7 +2947,8 @@
		"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
		"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
		"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
		"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394";
		"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",
		"msm-dai-q6-dev.16396";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		};
		@@ -3146,6 +3147,11 @@
		qcom,msm-dai-q6-dev-id = <16394>;
		};

		sb_6_rx: qcom,msm-dai-q6-sb-6-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <16396>;
		};

		};

		dai_pri_auxpcm: qcom,msm-pri-auxpcm {

sound/soc/codecs/wcd9335.c

+41 −1

Original line number	Diff line number	Diff line
		@@ -354,6 +354,7 @@ enum {
		AIF2_CAP,
		AIF3_PB,
		AIF3_CAP,
		AIF4_PB,
		AIF_MIX1_PB,
		AIF4_MAD_TX,
		AIF4_VIFEED,
		@@ -471,6 +472,7 @@ static const u32 vport_slim_check_table[NUM_CODEC_DAIS] = {
		BIT(AIF1_CAP) \| BIT(AIF3_CAP) \| BIT(AIF4_MAD_TX), /* AIF2_CAP */
		0, /* AIF3_PB */
		BIT(AIF1_CAP) \| BIT(AIF2_CAP) \| BIT(AIF4_MAD_TX), /* AIF3_CAP */
		0, /* AIF4_PB */
		0, /* AIF_MIX1_PB */
		BIT(AIF1_CAP) \| BIT(AIF2_CAP) \| BIT(AIF3_CAP), /* AIF4_MAD_TX */
		};
		@@ -2334,7 +2336,7 @@ static int slim_rx_mux_get(struct snd_kcontrol *kcontrol,
		}

		static const char *const slim_rx_mux_text[] = {
		"ZERO", "AIF1_PB", "AIF2_PB", "AIF3_PB", "AIF_MIX1_PB"
		"ZERO", "AIF1_PB", "AIF2_PB", "AIF3_PB", "AIF4_PB", "AIF_MIX1_PB"
		};

		static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,
		@@ -2404,6 +2406,17 @@ static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,
		&tasha_p->dai[AIF3_PB].wcd9xxx_ch_list);
		break;
		case 4:
		if (wcd9xxx_rx_vport_validation(port_id +
		TASHA_RX_PORT_START_NUMBER,
		&tasha_p->dai[AIF4_PB].wcd9xxx_ch_list)) {
		dev_dbg(codec->dev, "%s: RX%u is used by current requesting AIF_PB itself\n",
		__func__, port_id);
		goto rtn;
		}
		list_add_tail(&core->rx_chs[port_id].list,
		&tasha_p->dai[AIF4_PB].wcd9xxx_ch_list);
		break;
		case 5:
		if (wcd9xxx_rx_vport_validation(port_id +
		TASHA_RX_PORT_START_NUMBER,
		&tasha_p->dai[AIF_MIX1_PB].wcd9xxx_ch_list)) {
		@@ -6480,6 +6493,15 @@ static const struct snd_soc_dapm_route audio_map[] = {
		{"SLIM RX5 MUX", "AIF3_PB", "AIF3 PB"},
		{"SLIM RX6 MUX", "AIF3_PB", "AIF3 PB"},
		{"SLIM RX7 MUX", "AIF3_PB", "AIF3 PB"},
		/* SLIM_MUX("AIF4_PB", "AIF4 PB"),*/
		{"SLIM RX0 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX1 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX2 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX3 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX4 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX5 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX6 MUX", "AIF4_PB", "AIF4 PB"},
		{"SLIM RX7 MUX", "AIF4_PB", "AIF4 PB"},

		/* SLIM_MUX("AIF_MIX1_PB", "AIF MIX1 PB"),*/
		{"SLIM RX0 MUX", "AIF_MIX1_PB", "AIF MIX1 PB"},
		@@ -9526,6 +9548,9 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
		SND_SOC_DAPM_AIF_IN_E("AIF3 PB", "AIF3 Playback", 0, SND_SOC_NOPM,
		AIF3_PB, 0, tasha_codec_enable_slimrx,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_AIF_IN_E("AIF4 PB", "AIF4 Playback", 0, SND_SOC_NOPM,
		AIF4_PB, 0, tasha_codec_enable_slimrx,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_AIF_IN_E("AIF MIX1 PB", "AIF Mix Playback", 0,
		SND_SOC_NOPM, AIF_MIX1_PB, 0,
		tasha_codec_enable_slimrx,
		@@ -10275,6 +10300,7 @@ static int tasha_get_channel_map(struct snd_soc_dai *dai,
		case AIF1_PB:
		case AIF2_PB:
		case AIF3_PB:
		case AIF4_PB:
		case AIF_MIX1_PB:
		if (!rx_slot \|\| !rx_num) {
		pr_err("%s: Invalid rx_slot %p or rx_num %p\n",
		@@ -10923,6 +10949,20 @@ static struct snd_soc_dai_driver tasha_dai[] = {
		},
		.ops = &tasha_dai_ops,
		},
		{
		.name = "tasha_rx4",
		.id = AIF4_PB,
		.playback = {
		.stream_name = "AIF4 Playback",
		.rates = WCD9335_RATES_MASK \| WCD9335_FRAC_RATES_MASK,
		.formats = TASHA_FORMATS_S16_S24_LE,
		.rate_min = 8000,
		.rate_max = 192000,
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &tasha_dai_ops,
		},
		{
		.name = "tasha_mix_rx1",
		.id = AIF_MIX1_PB,

sound/soc/msm/msm-dai-fe.c

+17 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, 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
		@@ -458,6 +458,22 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "SLIMBUS4_HOSTLESS",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "SLIMBUS6_HOSTLESS Playback",
		.aif_name = "SLIM6_DL_HL",
		.rates = SNDRV_PCM_RATE_8000_192000,
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE),
		.channels_min = 1,
		.channels_max = 8,
		.rate_min = 8000,
		.rate_max = 192000,
		},
		.ops = &msm_fe_dai_ops,
		.name = "SLIMBUS6_HOSTLESS",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "INT_FM_HOSTLESS Playback",

sound/soc/msm/msm8996.c

+186 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2016, 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
		@@ -70,6 +70,8 @@ static int hdmi_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int msm8996_auxpcm_rate = SAMPLING_RATE_8KHZ;
		static int slim5_rx_sample_rate = SAMPLING_RATE_48KHZ;
		static int slim5_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		static int slim6_rx_sample_rate = SAMPLING_RATE_48KHZ;
		static int slim6_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

		static struct platform_device *spdev;
		static int ext_us_amp_gpio = -1;
		@@ -78,6 +80,7 @@ static int msm_slim_0_rx_ch = 1;
		static int msm_slim_0_tx_ch = 1;
		static int msm_slim_1_tx_ch = 1;
		static int msm_slim_5_rx_ch = 1;
		static int msm_slim_6_rx_ch = 1;
		static int msm_hifi_control;
		static int msm_vi_feed_tx_ch = 2;

		@@ -93,6 +96,7 @@ static const char *const pin_states[] = {"Disable", "active"};
		static const char *const spk_function[] = {"Off", "On"};
		static const char *const slim0_rx_ch_text[] = {"One", "Two"};
		static const char *const slim5_rx_ch_text[] = {"One", "Two"};
		static const char *const slim6_rx_ch_text[] = {"One", "Two"};
		static const char *const slim0_tx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven",
		"Eight"};
		@@ -101,11 +105,14 @@ static char const *hdmi_rx_ch_text[] = {"Two", "Three", "Four", "Five",
		"Six", "Seven", "Eight"};
		static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE"};
		static char const *slim5_rx_bit_format_text[] = {"S16_LE", "S24_LE"};
		static char const *slim6_rx_bit_format_text[] = {"S16_LE", "S24_LE"};
		static char const *slim0_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
		"KHZ_192", "KHZ_44P1", "KHZ_8",
		"KHZ_16", "KHZ_32"};
		static char const *slim5_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
		"KHZ_192", "KHZ_44P1"};
		static char const *slim6_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
		"KHZ_192", "KHZ_44P1"};
		static const char *const proxy_rx_ch_text[] = {"One", "Two", "Three", "Four",
		"Five", "Six", "Seven", "Eight"};

		@@ -615,6 +622,63 @@ static int slim5_rx_sample_rate_put(struct snd_kcontrol *kcontrol,
		return 0;
		}

		static int slim6_rx_sample_rate_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		int sample_rate_val = 0;

		switch (slim6_rx_sample_rate) {
		case SAMPLING_RATE_44P1KHZ:
		sample_rate_val = 3;
		break;

		case SAMPLING_RATE_192KHZ:
		sample_rate_val = 2;
		break;

		case SAMPLING_RATE_96KHZ:
		sample_rate_val = 1;
		break;

		case SAMPLING_RATE_48KHZ:
		default:
		sample_rate_val = 0;
		break;
		}

		ucontrol->value.integer.value[0] = sample_rate_val;
		pr_debug("%s: slim6_rx_sample_rate = %d\n", __func__,
		slim6_rx_sample_rate);

		return 0;
		}

		static int slim6_rx_sample_rate_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		switch (ucontrol->value.integer.value[0]) {
		case 3:
		slim6_rx_sample_rate = SAMPLING_RATE_44P1KHZ;
		break;
		case 2:
		slim6_rx_sample_rate = SAMPLING_RATE_192KHZ;
		break;
		case 1:
		slim6_rx_sample_rate = SAMPLING_RATE_96KHZ;
		break;
		case 0:
		default:
		slim6_rx_sample_rate = SAMPLING_RATE_48KHZ;
		break;
		}

		pr_debug("%s: ucontrol value = %ld, slim6_rx_sample_rate = %d\n",
		__func__, ucontrol->value.integer.value[0],
		slim6_rx_sample_rate);

		return 0;
		}

		static int slim0_tx_bit_format_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		@@ -825,6 +889,43 @@ static int slim5_rx_bit_format_put(struct snd_kcontrol *kcontrol,
		return 0;
		}

		static int slim6_rx_bit_format_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{

		switch (slim6_rx_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: slim6_rx_bit_format = %d, ucontrol value = %ld\n",
		__func__, slim6_rx_bit_format,
		ucontrol->value.integer.value[0]);

		return 0;
		}

		static int slim6_rx_bit_format_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		switch (ucontrol->value.integer.value[0]) {
		case 1:
		slim6_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;
		break;
		case 0:
		default:
		slim6_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;
		break;
		}
		return 0;
		}

		static int slim0_rx_bit_format_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		@@ -880,6 +981,24 @@ static int msm_slim_5_rx_ch_put(struct snd_kcontrol *kcontrol,
		return 1;
		}

		static int msm_slim_6_rx_ch_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		pr_debug("%s: msm_slim_6_rx_ch = %d\n", __func__,
		msm_slim_6_rx_ch);
		ucontrol->value.integer.value[0] = msm_slim_6_rx_ch - 1;
		return 0;
		}

		static int msm_slim_6_rx_ch_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		msm_slim_6_rx_ch = ucontrol->value.integer.value[0] + 1;
		pr_debug("%s: msm_slim_6_rx_ch = %d\n", __func__,
		msm_slim_6_rx_ch);
		return 1;
		}

		static int msm_slim_0_rx_ch_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		@@ -1245,6 +1364,26 @@ static int msm_slim_5_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		return 0;
		}

		static int msm_slim_6_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params)
		{
		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);

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		slim6_rx_bit_format);
		rate->min = rate->max = slim6_rx_sample_rate;
		channels->min = channels->max = msm_slim_6_rx_ch;

		pr_debug("%s: format = %d, rate = %d, channels = %d\n",
		__func__, params_format(params), params_rate(params),
		msm_slim_6_rx_ch);

		return 0;
		}

		static int msm_slim_0_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params)
		{
		@@ -1371,6 +1510,9 @@ static const struct soc_enum msm_snd_enum[] = {
		SOC_ENUM_SINGLE_EXT(2, slim5_rx_ch_text),
		SOC_ENUM_SINGLE_EXT(2, hifi_function),
		SOC_ENUM_SINGLE_EXT(2, vi_feed_ch_text),
		SOC_ENUM_SINGLE_EXT(4, slim6_rx_sample_rate_text),
		SOC_ENUM_SINGLE_EXT(2, slim6_rx_bit_format_text),
		SOC_ENUM_SINGLE_EXT(2, slim6_rx_ch_text),
		};

		static const struct snd_kcontrol_new msm_snd_controls[] = {
		@@ -1380,6 +1522,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		msm_slim_0_rx_ch_get, msm_slim_0_rx_ch_put),
		SOC_ENUM_EXT("SLIM_5_RX Channels", msm_snd_enum[10],
		msm_slim_5_rx_ch_get, msm_slim_5_rx_ch_put),
		SOC_ENUM_EXT("SLIM_6_RX Channels", msm_snd_enum[15],
		msm_slim_6_rx_ch_get, msm_slim_6_rx_ch_put),
		SOC_ENUM_EXT("SLIM_0_TX Channels", msm_snd_enum[2],
		msm_slim_0_tx_ch_get, msm_slim_0_tx_ch_put),
		SOC_ENUM_EXT("SLIM_1_TX Channels", msm_snd_enum[2],
		@@ -1393,10 +1537,14 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
		slim0_rx_bit_format_get, slim0_rx_bit_format_put),
		SOC_ENUM_EXT("SLIM_5_RX Format", msm_snd_enum[9],
		slim5_rx_bit_format_get, slim5_rx_bit_format_put),
		SOC_ENUM_EXT("SLIM_6_RX Format", msm_snd_enum[14],
		slim6_rx_bit_format_get, slim6_rx_bit_format_put),
		SOC_ENUM_EXT("SLIM_0_RX SampleRate", msm_snd_enum[5],
		slim0_rx_sample_rate_get, slim0_rx_sample_rate_put),
		SOC_ENUM_EXT("SLIM_5_RX SampleRate", msm_snd_enum[8],
		slim5_rx_sample_rate_get, slim5_rx_sample_rate_put),
		SOC_ENUM_EXT("SLIM_6_RX SampleRate", msm_snd_enum[13],
		slim6_rx_sample_rate_get, slim6_rx_sample_rate_put),
		SOC_ENUM_EXT("HDMI_RX Bit Format", msm_snd_enum[4],
		hdmi_rx_bit_format_get, hdmi_rx_bit_format_put),
		SOC_ENUM_EXT("PROXY_RX Channels", msm_snd_enum[6],
		@@ -1841,6 +1989,10 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream,
		pr_debug("%s: rx_5_ch=%d\n", __func__,
		msm_slim_5_rx_ch);
		rx_ch_count = msm_slim_5_rx_ch;
		} else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_6_RX) {
		pr_debug("%s: rx_6_ch=%d\n", __func__,
		msm_slim_6_rx_ch);
		rx_ch_count = msm_slim_6_rx_ch;
		} else {
		pr_debug("%s: rx_0_ch=%d\n", __func__,
		msm_slim_0_rx_ch);
		@@ -2783,6 +2935,23 @@ static struct snd_soc_dai_link msm8996_tasha_fe_dai_links[] = {
		.codec_name = "tasha_codec",
		.ops = &msm8996_cpe_ops,
		},
		/* slimbus rx 6 hostless */
		{
		.name = "SLIMBUS_6 Hostless Playback",
		.stream_name = "SLIMBUS_6 Hostless",
		.cpu_dai_name = "SLIMBUS6_HOSTLESS",
		.platform_name = "msm-pcm-hostless",
		.dynamic = 1,
		.dpcm_playback = 1,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		SND_SOC_DPCM_TRIGGER_POST},
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
		.ignore_suspend = 1,
		/* this dailink has playback support */
		.ignore_pmdown_time = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		},
		};

		static struct snd_soc_dai_link msm8996_common_be_dai_links[] = {
		@@ -3056,6 +3225,22 @@ static struct snd_soc_dai_link msm8996_tasha_be_dai_links[] = {
		.ops = &msm8996_be_ops,
		.ignore_suspend = 1,
		},
		{
		.name = LPASS_BE_SLIMBUS_6_RX,
		.stream_name = "Slimbus6 Playback",
		.cpu_dai_name = "msm-dai-q6-dev.16396",
		.platform_name = "msm-pcm-routing",
		.codec_name = "tasha_codec",
		.codec_dai_name = "tasha_rx4",
		.no_pcm = 1,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_6_RX,
		.be_hw_params_fixup = msm_slim_6_rx_be_hw_params_fixup,
		.ops = &msm8996_be_ops,
		/* dai link has playback support */
		.ignore_pmdown_time = 1,
		.ignore_suspend = 1,
		},
		};

		static struct snd_soc_dai_link msm8996_hdmi_dai_link[] = {

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+171 −2

File changed.

Preview size limit exceeded, changes collapsed.