From 25b381e74e13700f434acb2319124f1c38272cd4 Mon Sep 17 00:00:00 2001 From: Vicky Sehrawat Date: Thu, 25 Apr 2013 14:21:42 -0700 Subject: ASoC: msm: Fix for setting the Sample Rate for BT Add the mixer controls in kcontrols for setting BT sample rate. The actual sample rate is passed in the mixer control instead of passing an enum value in the mixer control. Change-Id: I4029eedbedac2c4eece036b63cec895c69952140 Signed-off-by: Vicky Sehrawat --- sound/soc/msm/msm8226.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'sound/soc/msm/msm8226.c') diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c index f0bfa5fbb48b..937b47389c76 100644 --- a/sound/soc/msm/msm8226.c +++ b/sound/soc/msm/msm8226.c @@ -295,10 +295,10 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { switch (ucontrol->value.integer.value[0]) { - case 0: + case 8000: msm_btsco_rate = BTSCO_RATE_8KHZ; break; - case 1: + case 16000: msm_btsco_rate = BTSCO_RATE_16KHZ; break; default: @@ -310,11 +310,6 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol, return 0; } -static const struct snd_kcontrol_new int_btsco_rate_mixer_controls[] = { - SOC_ENUM_EXT("Internal BTSCO SampleRate", msm_btsco_enum[0], - msm_btsco_rate_get, msm_btsco_rate_put), -}; - static int msm_btsco_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -549,6 +544,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("AUX PCM SampleRate", msm8226_auxpcm_enum[0], msm8226_auxpcm_rate_get, msm8226_auxpcm_rate_put), + SOC_ENUM_EXT("Internal BTSCO SampleRate", msm_btsco_enum[0], + msm_btsco_rate_get, msm_btsco_rate_put), }; static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) -- cgit v1.2.3