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/arm/mach-shmobile/board-kzm9g.c | |
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/arm/mach-shmobile/board-kzm9g.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index bc40b853ffd3..03dc3ac84502 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c | |||
@@ -589,14 +589,12 @@ static struct asoc_simple_card_info fsi2_ak4648_info = { | |||
589 | .card = "FSI2A-AK4648", | 589 | .card = "FSI2A-AK4648", |
590 | .codec = "ak4642-codec.0-0012", | 590 | .codec = "ak4642-codec.0-0012", |
591 | .platform = "sh_fsi2", | 591 | .platform = "sh_fsi2", |
592 | .daifmt = SND_SOC_DAIFMT_LEFT_J, | 592 | .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, |
593 | .cpu_dai = { | 593 | .cpu_dai = { |
594 | .name = "fsia-dai", | 594 | .name = "fsia-dai", |
595 | .fmt = SND_SOC_DAIFMT_CBS_CFS, | ||
596 | }, | 595 | }, |
597 | .codec_dai = { | 596 | .codec_dai = { |
598 | .name = "ak4642-hifi", | 597 | .name = "ak4642-hifi", |
599 | .fmt = SND_SOC_DAIFMT_CBM_CFM, | ||
600 | .sysclk = 11289600, | 598 | .sysclk = 11289600, |
601 | }, | 599 | }, |
602 | }; | 600 | }; |