rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Merge "ASoC: Change to correctly set the BTSCO Sample Rate"

Browse Source
This commit is contained in:
Linux Build Service Account
2015-03-05 16:26:31 -08:00
committed by Gerrit - the friendly Code Review server
parent 9f1a6540c9 ae826bf76e
commit d25acdbef8
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/soc/msm/msm8226.c
+3 -3
View File
@@ -404,7 +404,7 @@ static const struct soc_enum msm_enum[] = {
SOC_ENUM_SINGLE_EXT(4, slim0_tx_ch_text),
};
static const char *const btsco_rate_text[] = {"8000", "16000"};
static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ", "BTSCO_RATE_16KHZ"};
static const struct soc_enum msm_btsco_enum[] = {
SOC_ENUM_SINGLE_EXT(2, btsco_rate_text),
};
@@ -510,10 +510,10 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
switch (ucontrol->value.integer.value[0]) {
case 8000:
case 0:
msm_btsco_rate = BTSCO_RATE_8KHZ;
break;
case 16000:
case 1:
msm_btsco_rate = BTSCO_RATE_16KHZ;
break;
default:
sound/soc/msm/msm8974.c
+3 -3
View File
@@ -728,7 +728,7 @@ static const char *const proxy_rx_ch_text[] = {"One", "Two", "Three", "Four",
static char const *hdmi_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
"KHZ_192"};
static const char *const btsco_rate_text[] = {"8000", "16000"};
static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ", "BTSCO_RATE_16KHZ"};
static const struct soc_enum msm_btsco_enum[] = {
SOC_ENUM_SINGLE_EXT(2, btsco_rate_text),
};
@@ -870,10 +870,10 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
switch (ucontrol->value.integer.value[0]) {
case 8000:
case 0:
msm_btsco_rate = BTSCO_RATE_8KHZ;
break;
case 16000:
case 1:
msm_btsco_rate = BTSCO_RATE_16KHZ;
break;
default:
sound/soc/msm/msm8x10.c
+3 -3
View File
@@ -296,7 +296,7 @@ static int msm_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
}
static const char *const btsco_rate_text[] = {"8000", "16000"};
static const char *const btsco_rate_text[] = {"BTSCO_RATE_8KHZ", "BTSCO_RATE_16KHZ"};
static const struct soc_enum msm_btsco_enum[] = {
SOC_ENUM_SINGLE_EXT(2, btsco_rate_text),
};
@@ -316,10 +316,10 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
switch (ucontrol->value.integer.value[0]) {
case 8000:
case 0:
msm_btsco_rate = BTSCO_RATE_8KHZ;
break;
case 16000:
case 1:
msm_btsco_rate = BTSCO_RATE_16KHZ;
break;
default: