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

Merge changes I144bd8ad,Ic73cbec2 into msm-4.4

Browse source 
* changes:
  ASoC: msm: Quat MI2S capture dai update for 88.2 and 176.4 Khz rates
  ASoC: msm8998: Add 88.2 and 176.4 khz support for MI2S Interface
This commit is contained in:
Linux Build Service Account 2017-08-20 01:17:30 -07:00 • committed by Gerrit - the friendly Code Review server
commit d7d541d471
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sound/soc/msm/msm8998.c
View file

@ -434,7 +434,8 @@ static char const *tdm_sample_rate_text[] = {"KHZ_8", "KHZ_16", "KHZ_32",
static const char *const auxpcm_rate_text[] = {"KHZ_8", "KHZ_16"};
static char const *mi2s_rate_text[] = {"KHZ_8", "KHZ_16",
"KHZ_32", "KHZ_44P1", "KHZ_48",
"KHZ_96", "KHZ_192"};
"KHZ_88P2", "KHZ_96", "KHZ_176P4",
"KHZ_192"};
static const char *const mi2s_ch_text[] = {"One", "Two", "Three", "Four",
"Five", "Six", "Seven",
"Eight"};
@ -2228,12 +2229,18 @@ static int mi2s_get_sample_rate_val(int sample_rate)
case SAMPLING_RATE_48KHZ:
sample_rate_val = 4;
break;
case SAMPLING_RATE_96KHZ:
case SAMPLING_RATE_88P2KHZ:
sample_rate_val = 5;
break;
case SAMPLING_RATE_192KHZ:
case SAMPLING_RATE_96KHZ:
sample_rate_val = 6;
break;
case SAMPLING_RATE_176P4KHZ:
sample_rate_val = 7;
break;
case SAMPLING_RATE_192KHZ:
sample_rate_val = 8;
break;
default:
sample_rate_val = 4;
break;
@ -2262,9 +2269,15 @@ static int mi2s_get_sample_rate(int value)
sample_rate = SAMPLING_RATE_48KHZ;
break;
case 5:
sample_rate = SAMPLING_RATE_96KHZ;
sample_rate = SAMPLING_RATE_88P2KHZ;
break;
case 6:
sample_rate = SAMPLING_RATE_96KHZ;
break;
case 7:
sample_rate = SAMPLING_RATE_176P4KHZ;
break;
case 8:
sample_rate = SAMPLING_RATE_192KHZ;
break;
default:

3
sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
View file

@ -4152,7 +4152,8 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = {
.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |
SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_192000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.rate_min = 8000,