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

Commit a4271a0d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: add BT RX and TX mixer ctrls"

parents 4d64b5ae d79190a7

asoc/sdm660-external.c

+138 −1
Original line number Diff line number Diff line
@@ -124,7 +124,12 @@ static const char *const spk_function_text[] = {"Off", "On"}; 
static char const *bt_sample_rate_text[] = {"KHZ_8", "KHZ_16",

					"KHZ_44P1", "KHZ_48",

					"KHZ_88P2", "KHZ_96"};



static char const *bt_sample_rate_rx_text[] = {"KHZ_8", "KHZ_16",

					"KHZ_44P1", "KHZ_48",

					"KHZ_88P2", "KHZ_96"};

static char const *bt_sample_rate_tx_text[] = {"KHZ_8", "KHZ_16",

					"KHZ_44P1", "KHZ_48",

					"KHZ_88P2", "KHZ_96"};

static SOC_ENUM_SINGLE_EXT_DECL(spk_func_en, spk_function_text);

static SOC_ENUM_SINGLE_EXT_DECL(slim_0_rx_chs, slim_rx_ch_text);

static SOC_ENUM_SINGLE_EXT_DECL(slim_2_rx_chs, slim_rx_ch_text);
@@ -143,6 +148,8 @@ 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_sample_rate, bt_sample_rate_text);

static SOC_ENUM_SINGLE_EXT_DECL(bt_sample_rate_rx, bt_sample_rate_rx_text);

static SOC_ENUM_SINGLE_EXT_DECL(bt_sample_rate_tx, bt_sample_rate_tx_text);



static int slim_get_sample_rate_val(int sample_rate)

{
@@ -379,6 +386,130 @@ static int msm_bt_sample_rate_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int msm_bt_sample_rate_rx_get(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	switch (slim_rx_cfg[SLIM_RX_7].sample_rate) {

	case SAMPLING_RATE_96KHZ:

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

		break;

	case SAMPLING_RATE_88P2KHZ:

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

		break;

	case SAMPLING_RATE_48KHZ:

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

		break;

	case SAMPLING_RATE_44P1KHZ:

		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_sample_rate_rx_put(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

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

	case 1:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_16KHZ;

		break;

	case 2:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_44P1KHZ;

		break;

	case 3:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_48KHZ;

		break;

	case 4:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_88P2KHZ;

		break;

	case 5:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_96KHZ;

		break;

	case 0:

	default:

		slim_rx_cfg[SLIM_RX_7].sample_rate = SAMPLING_RATE_8KHZ;

		break;

	}

	pr_debug("%s: sample rates: slim7_rx = %d, value = %d\n",

		 __func__,

		 slim_rx_cfg[SLIM_RX_7].sample_rate,

		 ucontrol->value.enumerated.item[0]);



	return 0;

}



static int msm_bt_sample_rate_tx_get(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	switch (slim_tx_cfg[SLIM_TX_7].sample_rate) {

	case SAMPLING_RATE_96KHZ:

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

		break;

	case SAMPLING_RATE_88P2KHZ:

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

		break;

	case SAMPLING_RATE_48KHZ:

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

		break;

	case SAMPLING_RATE_44P1KHZ:

		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_tx_cfg[SLIM_TX_7].sample_rate);



	return 0;

}



static int msm_bt_sample_rate_tx_put(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

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

	case 1:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_16KHZ;

		break;

	case 2:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_44P1KHZ;

		break;

	case 3:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_48KHZ;

		break;

	case 4:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_88P2KHZ;

		break;

	case 5:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_96KHZ;

		break;

	case 0:

	default:

		slim_tx_cfg[SLIM_TX_7].sample_rate = SAMPLING_RATE_8KHZ;

		break;

	}

	pr_debug("%s: sample rates: slim7_tx = %d, value = %d\n",

		 __func__,

		 slim_tx_cfg[SLIM_TX_7].sample_rate,

		 ucontrol->value.enumerated.item[0]);



	return 0;

}



static int slim_rx_sample_rate_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{
@@ -750,6 +881,12 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
	SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,

			msm_bt_sample_rate_get,

			msm_bt_sample_rate_put),

	SOC_ENUM_EXT("BT SampleRate RX", bt_sample_rate_rx,

			msm_bt_sample_rate_rx_get,

			msm_bt_sample_rate_rx_put),

	SOC_ENUM_EXT("BT SampleRate TX", bt_sample_rate_tx,

			msm_bt_sample_rate_tx_get,

			msm_bt_sample_rate_tx_put),

};



static int msm_slim_get_ch_from_beid(int32_t id)