diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 05:37:06 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 05:37:06 -0400 |
commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
tree | b459600bfffb55b6693b566f5dff859daa216dbe /sound/soc/au1x | |
parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) |
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 = { | |||
129 | .cpu_dai_name = "au1xpsc_i2s.2", | 129 | .cpu_dai_name = "au1xpsc_i2s.2", |
130 | .platform_name = "au1xpsc-pcm.2", | 130 | .platform_name = "au1xpsc-pcm.2", |
131 | .codec_name = "wm8731.0-001b", | 131 | .codec_name = "wm8731.0-001b", |
132 | .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | | ||
133 | SND_SOC_DAIFMT_CBM_CFM, | ||
132 | .ops = &db1200_i2s_wm8731_ops, | 134 | .ops = &db1200_i2s_wm8731_ops, |
133 | }; | 135 | }; |
134 | 136 | ||
@@ -146,6 +148,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = { | |||
146 | .cpu_dai_name = "au1xpsc_i2s.3", | 148 | .cpu_dai_name = "au1xpsc_i2s.3", |
147 | .platform_name = "au1xpsc-pcm.3", | 149 | .platform_name = "au1xpsc-pcm.3", |
148 | .codec_name = "wm8731.0-001b", | 150 | .codec_name = "wm8731.0-001b", |
151 | .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | | ||
152 | SND_SOC_DAIFMT_CBM_CFM, | ||
149 | .ops = &db1200_i2s_wm8731_ops, | 153 | .ops = &db1200_i2s_wm8731_ops, |
150 | }; | 154 | }; |
151 | 155 | ||