iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: gb-audio: Fix DAI formats and master/slave settings

Browse Source 
Set the various DAI formats so the bridge on the module
is the master of all clocks and the codec is the slave.
The only DAI protocol currently supported is I2S.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Mark A. Greer 2015-05-21 15:56:57 -07:00 committed by Greg Kroah-Hartman
parent 34aa7e1cad
commit 4c739e3ada
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/greybus/audio.c
View File

@ -110,14 +110,15 @@ static struct asoc_simple_card_info *setup_card_info(int device_count)
obj->card_info.platform = obj->platform_name;
obj->card_info.cpu_dai.name = obj->dai_name;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
obj->card_info.cpu_dai.fmt = GB_FMTS;
obj->card_info.cpu_dai.fmt = SND_SOC_DAIFMT_CBM_CFM;
#endif
#if USE_RT5645
obj->card_info.daifmt = GB_FMTS;
obj->card_info.daifmt = SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_I2S;
sprintf(obj->codec_name, "rt5645.%d-%04x", RT5647_I2C_ADAPTER_NR,
RT5647_I2C_ADDR);
obj->card_info.codec_dai.name = "rt5645-aif1";
obj->card_info.codec_dai.fmt = SND_SOC_DAIFMT_CBM_CFM;
obj->card_info.codec_dai.fmt = SND_SOC_DAIFMT_CBS_CFS;
obj->card_info.codec_dai.sysclk = 12288000;
#else
sprintf(obj->codec_name, "spdif-dit");