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

Commit 89c02527 authored by Naresh Tanniru's avatar Naresh Tanniru Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msmcobalt: add BT audio support 



Add machine driver code to support
bt playback in tunnel mode.

Change-Id: I22173ef9a7586cc7b9bc4b40afa1c02f5317c3a7
Signed-off-by: default avatarNaresh Tanniru <ntanniru@codeaurora.org>
parent 9d822a94

sound/soc/msm/msmcobalt.c

+32 −11
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static char const *bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE"}; 
static char const *slim_sample_rate_text[] = {"KHZ_8", "KHZ_16",

					"KHZ_32", "KHZ_44P1", "KHZ_48",

					"KHZ_96", "KHZ_192"};

static char const *bt_sco_sample_rate_text[] = {"KHZ_8", "KHZ_16"};

static char const *bt_sample_rate_text[] = {"KHZ_8", "KHZ_16", "KHZ_48"};

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

static char const *ch_text[] = {"Two", "Three", "Four", "Five",

					"Six", "Seven", "Eight"};
@@ -206,7 +206,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(slim_0_rx_sample_rate, slim_sample_rate_text); 
static SOC_ENUM_SINGLE_EXT_DECL(slim_0_tx_sample_rate, slim_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(slim_5_rx_sample_rate, slim_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(slim_6_rx_sample_rate, slim_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(bt_sco_sample_rate, bt_sco_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(bt_sample_rate, bt_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(usb_rx_sample_rate, usb_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(usb_tx_sample_rate, usb_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(hdmi_rx_sample_rate, hdmi_rx_sample_rate_text);
@@ -611,7 +611,7 @@ static int msm_vi_feed_tx_ch_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int msm_bt_sco_sample_rate_get(struct snd_kcontrol *kcontrol,

static int msm_bt_sample_rate_get(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	/*
@@ -619,14 +619,25 @@ static int msm_bt_sco_sample_rate_get(struct snd_kcontrol *kcontrol, 
	 * when used for BT_SCO use case. Return either Rx or Tx sample rate

	 * value.

	 */

	ucontrol->value.integer.value[0] = slim_rx_cfg[SLIM_RX_7].sample_rate;

	switch (slim_rx_cfg[SLIM_RX_7].sample_rate) {

	case SAMPLING_RATE_48KHZ:

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

		break;

	case SAMPLING_RATE_16KHZ:

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

		break;

	case SAMPLING_RATE_8KHZ:

	default:

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

		break;

	}

	pr_debug("%s: sample rate = %d", __func__,

		 slim_rx_cfg[SLIM_RX_7].sample_rate);



	return 0;

}



static int msm_bt_sco_sample_rate_put(struct snd_kcontrol *kcontrol,

static int msm_bt_sample_rate_put(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	switch (ucontrol->value.integer.value[0]) {
@@ -634,6 +645,10 @@ static int msm_bt_sco_sample_rate_put(struct snd_kcontrol *kcontrol, 
		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_16KHZ;

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_16KHZ;

		break;

	case 2:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_48KHZ;

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_48KHZ;

		break;

	case 0:

	default:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_8KHZ;
@@ -1134,9 +1149,9 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
			slim_rx_sample_rate_get, slim_rx_sample_rate_put),

	SOC_ENUM_EXT("SLIM_6_RX SampleRate", slim_6_rx_sample_rate,

			slim_rx_sample_rate_get, slim_rx_sample_rate_put),

	SOC_ENUM_EXT("BT_SCO SampleRate", bt_sco_sample_rate,

			msm_bt_sco_sample_rate_get,

			msm_bt_sco_sample_rate_put),

	SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,

			msm_bt_sample_rate_get,

			msm_bt_sample_rate_put),

	SOC_ENUM_EXT("USB_AUDIO_RX SampleRate", usb_rx_sample_rate,

			usb_audio_rx_sample_rate_get,

			usb_audio_rx_sample_rate_put),
@@ -1341,6 +1356,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_SLIMBUS_7_RX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

				slim_rx_cfg[SLIM_RX_7].bit_format);

		rate->min = rate->max = slim_rx_cfg[SLIM_RX_7].sample_rate;

		channels->min = channels->max =

			slim_rx_cfg[SLIM_RX_7].channels;
@@ -3131,7 +3148,11 @@ static struct snd_soc_dai_link msm_wcn_be_dai_links[] = { 
		.cpu_dai_name = "msm-dai-q6-dev.16398",

		.platform_name = "msm-pcm-routing",

		.codec_name = "btfmslim_slave",

		.codec_dai_name = "btfm_bt_sco_slim_rx",

		/* BT codec driver determines capabilities based on

		 * dai name, bt codecdai name should always contains

		 * supported usecase information

		 */

		.codec_dai_name = "btfm_bt_sco_a2dp_slim_rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_7_RX,