diff options
| -rw-r--r-- | sound/soc/msm/msm8226.c | 11 | ||||
| -rw-r--r-- | sound/soc/msm/msm8974.c | 11 |
2 files changed, 8 insertions, 14 deletions
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) diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c index 4f23efed85f3..da372315953b 100644 --- a/sound/soc/msm/msm8974.c +++ b/sound/soc/msm/msm8974.c @@ -862,10 +862,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: @@ -940,11 +940,6 @@ static int msm_hdmi_rx_ch_put(struct snd_kcontrol *kcontrol, return 1; } -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) { @@ -1350,6 +1345,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { hdmi_rx_bit_format_get, hdmi_rx_bit_format_put), SOC_ENUM_EXT("PROXY_RX Channels", msm_snd_enum[6], msm_proxy_rx_ch_get, msm_proxy_rx_ch_put), + SOC_ENUM_EXT("Internal BTSCO SampleRate", msm_btsco_enum[0], + msm_btsco_rate_get, msm_btsco_rate_put), }; static bool msm8974_swap_gnd_mic(struct snd_soc_codec *codec) |