diff options
| author | Takashi Iwai | 2015-10-07 20:11:21 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-10-07 20:11:21 +0200 |
| commit | 601d62959d08a450d4666c728ddd2f47c5ba1cfe (patch) | |
| tree | 52d9f3c1a2528a9de405d5a19014f3f94b16b35d /sound/soc/au1x | |
| parent | ALSA: synth: Fix conflicting OSS device registration on AWE32 (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' i... (diff) | |
| download | kernel-qcow2-linux-601d62959d08a450d4666c728ddd2f47c5ba1cfe.tar.gz kernel-qcow2-linux-601d62959d08a450d4666c728ddd2f47c5ba1cfe.tar.xz kernel-qcow2-linux-601d62959d08a450d4666c728ddd2f47c5ba1cfe.zip | |
Merge tag 'asoc-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.3
Quite a few fixes here but they're all very small and driver specific,
none of them really stand out if you aren't using the relevant hardware
but they're all useful if you do happen to have an affected device.
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 58c3164802b8..8c907ebea189 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, }; |