diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
| commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
| tree | b459600bfffb55b6693b566f5dff859daa216dbe /sound/soc/au1x | |
| parent | ALSA: firewire-tascam: change device probing processing (diff) | |
| parent | ALSA: hda - Fix inverted internal mic on Lenovo G50-80 (diff) | |
| download | linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.xz linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/au1x')
| -rw-r--r-- | sound/soc/au1x/db1200.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index 638ca0ba7e6e..5c73061d912a 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -129,6 +129,8 @@ static struct snd_soc_dai_link db1300_i2s_dai = { .cpu_dai_name = "au1xpsc_i2s.2", .platform_name = "au1xpsc-pcm.2", .codec_name = "wm8731.0-001b", + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &db1200_i2s_wm8731_ops, }; @@ -146,6 +148,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = { .cpu_dai_name = "au1xpsc_i2s.3", .platform_name = "au1xpsc-pcm.3", .codec_name = "wm8731.0-001b", + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &db1200_i2s_wm8731_ops, }; |