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

Commit f18d5baf authored by Vatsal Bucha's avatar Vatsal Bucha
Browse files

ASoC: msm8952: add new backends for RX and TX 



Slimbus to i2s bridge uses Slimbus2 TX and Slimbus4 RX
as backends. Hence add required dailinks.

CRs-Fixed: 2039443
Change-Id: I13b83cbfe59e3893490809568f0bcf1b0d96663c
Signed-off-by: default avatarVatsal Bucha <vbucha@codeaurora.org>
parent 6540f567

sound/soc/msm/msm8952-dai-links.c

+15 −1
Original line number Diff line number Diff line
@@ -223,6 +223,20 @@ static struct snd_soc_dai_link msm8952_tasha_be_dai[] = { 
		.ops = &msm8952_slimbus_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_SLIMBUS_2_TX,

		.stream_name = "Slimbus2 Capture",

		.cpu_dai_name = "msm-dai-q6-dev.16389",

		.platform_name = "msm-pcm-routing",

		.codec_name = "tasha_codec",

		.codec_dai_name = "tasha_tx4",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_2_TX,

		.be_hw_params_fixup = msm_slim_2_tx_be_hw_params_fixup,

		.ops = &msm8952_slimbus_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_SLIMBUS_3_RX,

		.stream_name = "Slimbus3 Playback",
@@ -259,7 +273,7 @@ static struct snd_soc_dai_link msm8952_tasha_be_dai[] = { 
		.cpu_dai_name = "msm-dai-q6-dev.16392",

		.platform_name = "msm-pcm-routing",

		.codec_name = "tasha_codec",

		.codec_dai_name = "tasha_mix_rx1",

		.codec_dai_name = "tasha_rx5",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_4_RX,

sound/soc/msm/msm8952-slimbus.c

+97 −0
Original line number Diff line number Diff line
@@ -92,9 +92,11 @@ static int slim1_tx_sample_rate = SAMPLING_RATE_48KHZ; 
static int slim0_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int slim0_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int slim1_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int slim2_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

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_2_tx_ch = 1;

static int msm_vi_feed_tx_ch = 2;

static int msm_slim_5_rx_ch = 1;

static int msm_slim_6_rx_ch = 1;
@@ -951,6 +953,51 @@ static int slim0_tx_bit_format_put(struct snd_kcontrol *kcontrol, 
	return rc;

}



static int slim2_tx_bit_format_get(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{

	switch (slim2_tx_bit_format) {

	case SNDRV_PCM_FORMAT_S24_3LE:

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

		break;

	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: slim2_tx_bit_format = %d, ucontrol value = %ld\n",

			__func__, slim2_tx_bit_format,

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

	return 0;

}



static int slim2_tx_bit_format_put(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{

	int rc = 0;



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

	case 2:

		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;

	case 1:

		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		break;

	case 0:

		slim2_tx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

		break;

	default:

		pr_err("%s: invalid value %ld\n", __func__,

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

		rc = -EINVAL;

		break;

	}

	return rc;

}



static int msm_slim_5_rx_ch_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{
@@ -1005,6 +1052,24 @@ static int msm_slim_0_tx_ch_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int msm_slim_2_tx_ch_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	pr_debug("%s: msm_slim_2_tx_ch  = %d\n", __func__,

		 msm_slim_2_tx_ch);

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

	return 0;

}



static int msm_slim_2_tx_ch_put(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

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



	pr_debug("%s: msm_slim_2_tx_ch = %d\n", __func__, msm_slim_2_tx_ch);

	return 1;

}



static int slim0_tx_sample_rate_get(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{
@@ -1532,9 +1597,15 @@ static const char *const spk_function[] = {"Off", "On"}; 
static const char *const slim0_rx_ch_text[] = {"One", "Two", "Three", "Four",

						"Five", "Six", "Seven",

						"Eight"};

static const char *const slim4_rx_ch_text[] = {"One", "Two", "Three", "Four",

						"Five", "Six", "Seven",

						"Eight"};

static const char *const slim0_tx_ch_text[] = {"One", "Two", "Three", "Four",

						"Five", "Six", "Seven",

						"Eight"};

static const char *const slim2_tx_ch_text[] = {"One", "Two", "Three", "Four",

						"Five", "Six", "Seven",

						"Eight"};

static const char *const vi_feed_ch_text[] = {"One", "Two"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE"};

static char const *slim0_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
@@ -1579,6 +1650,8 @@ static const struct soc_enum msm_snd_enum[] = { 
				tdm_bit_format_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(tdm_sample_rate_text),

				tdm_sample_rate_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(slim4_rx_ch_text), slim4_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(8, slim2_tx_ch_text),

};



static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ",
@@ -1606,6 +1679,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
			msm_slim_0_tx_ch_get, msm_slim_0_tx_ch_put),

	SOC_ENUM_EXT("SLIM_1_TX Channels", msm_snd_enum[2],

			msm_slim_1_tx_ch_get, msm_slim_1_tx_ch_put),

	SOC_ENUM_EXT("SLIM_2_TX Channels", msm_snd_enum[17],

			msm_slim_2_tx_ch_get, msm_slim_2_tx_ch_put),

	SOC_ENUM_EXT("MI2S_RX Format", msm_snd_enum[3],

			mi2s_rx_bit_format_get, mi2s_rx_bit_format_put),

	SOC_ENUM_EXT("SLIM_0_RX Format", msm_snd_enum[3],
@@ -1626,6 +1701,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
			slim0_tx_sample_rate_get, slim0_tx_sample_rate_put),

	SOC_ENUM_EXT("SLIM_0_TX Format", msm_snd_enum[3],

			slim0_tx_bit_format_get, slim0_tx_bit_format_put),

	SOC_ENUM_EXT("SLIM_2_TX Format", msm_snd_enum[3],

			slim2_tx_bit_format_get, slim2_tx_bit_format_put),

	SOC_ENUM_EXT("Internal BTSCO SampleRate", msm_btsco_enum[0],

			msm_btsco_rate_get, msm_btsco_rate_put),

	SOC_ENUM_EXT("AUXPCM SampleRate", msm_auxpcm_enum[0],
@@ -2044,6 +2121,8 @@ int msm_snd_hw_params(struct snd_pcm_substream *substream, 
		/* For <codec>_tx2 case */

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX)

			user_set_tx_ch = msm_slim_1_tx_ch;

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_2_TX)

			user_set_tx_ch = msm_slim_2_tx_ch;

		else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_3_TX)

			/* DAI 5 is used for external EC reference from codec.

			 * Since Rx is fed as reference for EC, the config of
@@ -2182,6 +2261,24 @@ int msm_slim_1_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



int msm_slim_2_tx_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);



	pr_debug("%s()\n", __func__);

	param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

				slim2_tx_bit_format);

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

	channels->min = channels->max = msm_slim_2_tx_ch;



	return 0;

}



int msm_slim_4_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

					    struct snd_pcm_hw_params *params)

{

sound/soc/msm/msm8952-slimbus.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ int msm_slim_0_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
					    struct snd_pcm_hw_params *params);

int msm_slim_1_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

					    struct snd_pcm_hw_params *params);

int msm_slim_2_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

					    struct snd_pcm_hw_params *params);

int msm_slim_4_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				struct snd_pcm_hw_params *params);

int msm_slim_5_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,