diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-03-13 20:56:25 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-14 15:30:59 -0400 |
commit | c7a507eea1db1430476289f525f9c853d5d485e8 (patch) | |
tree | 81c0c245a118e9ffc8d06409f1f9570ba2fe2567 /arch/sh/boards/mach-se | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags
SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode.
Then, FSI will be master mode if it was SND_SOC_DAIFMT_CBS_CFS.
This patch fixup platform settings too.
Then, it tidyups SND_SOC_DAIFMT_INV settings.
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/sh/boards/mach-se')
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 21e4230659a5..1162bc6945a3 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -304,14 +304,12 @@ static struct asoc_simple_card_info fsi_ak4642_info = { | |||
304 | .card = "FSIA-AK4642", | 304 | .card = "FSIA-AK4642", |
305 | .codec = "ak4642-codec.0-0012", | 305 | .codec = "ak4642-codec.0-0012", |
306 | .platform = "sh_fsi.0", | 306 | .platform = "sh_fsi.0", |
307 | .daifmt = SND_SOC_DAIFMT_LEFT_J, | 307 | .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, |
308 | .cpu_dai = { | 308 | .cpu_dai = { |
309 | .name = "fsia-dai", | 309 | .name = "fsia-dai", |
310 | .fmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF, | ||
311 | }, | 310 | }, |
312 | .codec_dai = { | 311 | .codec_dai = { |
313 | .name = "ak4642-hifi", | 312 | .name = "ak4642-hifi", |
314 | .fmt = SND_SOC_DAIFMT_CBM_CFM, | ||
315 | .sysclk = 11289600, | 313 | .sysclk = 11289600, |
316 | }, | 314 | }, |
317 | }; | 315 | }; |