evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msmcobalt: Add 24 bit packed support"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-01 08:04:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 09955c92f3
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sound/soc/msm/msmcobalt.c
View file

@ -170,7 +170,7 @@ static const char *const slim_tx_ch_text[] = {"One", "Two", "Three", "Four",
"Five", "Six", "Seven", "Five", "Six", "Seven",
"Eight"}; "Eight"};
static const char *const vi_feed_ch_text[] = {"One", "Two"}; static const char *const vi_feed_ch_text[] = {"One", "Two"};
static char const *bit_format_text[] = {"S16_LE", "S24_LE"}; static char const *bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE"};
static char const *slim_sample_rate_text[] = {"KHZ_8", "KHZ_16", static char const *slim_sample_rate_text[] = {"KHZ_8", "KHZ_16",
"KHZ_32", "KHZ_44P1", "KHZ_48", "KHZ_32", "KHZ_44P1", "KHZ_48",
"KHZ_96", "KHZ_192"}; "KHZ_96", "KHZ_192"};
@ -325,6 +325,9 @@ static int slim_get_bit_format_val(int bit_format)
int val = 0; int val = 0;
switch (bit_format) { switch (bit_format) {
case SNDRV_PCM_FORMAT_S24_3LE:
val = 2;
break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
val = 1; val = 1;
break; break;
@ -347,6 +350,9 @@ static int slim_get_bit_format(int val)
case 1: case 1:
bit_fmt = SNDRV_PCM_FORMAT_S24_LE; bit_fmt = SNDRV_PCM_FORMAT_S24_LE;
break; break;
case 2:
bit_fmt = SNDRV_PCM_FORMAT_S24_3LE;
break;
default: default:
bit_fmt = SNDRV_PCM_FORMAT_S16_LE; bit_fmt = SNDRV_PCM_FORMAT_S16_LE;
break; break;
@ -749,6 +755,9 @@ static int usb_audio_rx_format_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
switch (usb_rx_cfg.bit_format) { switch (usb_rx_cfg.bit_format) {
case SNDRV_PCM_FORMAT_S24_3LE:
ucontrol->value.integer.value[0] = 2;
break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
ucontrol->value.integer.value[0] = 1; ucontrol->value.integer.value[0] = 1;
break; break;
@ -770,6 +779,9 @@ static int usb_audio_rx_format_put(struct snd_kcontrol *kcontrol,
int rc = 0; int rc = 0;
switch (ucontrol->value.integer.value[0]) { switch (ucontrol->value.integer.value[0]) {
case 2:
usb_rx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_3LE;
break;
case 1: case 1:
usb_rx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_LE; usb_rx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_LE;
break; break;
@ -893,6 +905,9 @@ static int usb_audio_tx_format_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
switch (usb_tx_cfg.bit_format) { switch (usb_tx_cfg.bit_format) {
case SNDRV_PCM_FORMAT_S24_3LE:
ucontrol->value.integer.value[0] = 2;
break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
ucontrol->value.integer.value[0] = 1; ucontrol->value.integer.value[0] = 1;
break; break;
@ -914,6 +929,9 @@ static int usb_audio_tx_format_put(struct snd_kcontrol *kcontrol,
int rc = 0; int rc = 0;
switch (ucontrol->value.integer.value[0]) { switch (ucontrol->value.integer.value[0]) {
case 2:
usb_tx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_3LE;
break;
case 1: case 1:
usb_tx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_LE; usb_tx_cfg.bit_format = SNDRV_PCM_FORMAT_S24_LE;
break; break;