Commit 4c739e3a authored by Mark A. Greer's avatar Mark A. Greer Committed by Greg Kroah-Hartman

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

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: default avatarMark A. Greer <mgreer@animalcreek.com>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 34aa7e1c
...@@ -110,14 +110,15 @@ static struct asoc_simple_card_info *setup_card_info(int device_count) ...@@ -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.platform = obj->platform_name;
obj->card_info.cpu_dai.name = obj->dai_name; obj->card_info.cpu_dai.name = obj->dai_name;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) #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 #endif
#if USE_RT5645 #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, sprintf(obj->codec_name, "rt5645.%d-%04x", RT5647_I2C_ADAPTER_NR,
RT5647_I2C_ADDR); RT5647_I2C_ADDR);
obj->card_info.codec_dai.name = "rt5645-aif1"; 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; obj->card_info.codec_dai.sysclk = 12288000;
#else #else
sprintf(obj->codec_name, "spdif-dit"); sprintf(obj->codec_name, "spdif-dit");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment