openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: bockw: fixup SND_SOC_DAIFMT_CBx_CFx flags 

SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode.
Then, rcar will be master mode if it was SND_SOC_DAIFMT_CBS_CFS.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Kuninori Morimoto 2014-03-23 20:27:30 -07:00 committed by Mark Brown
parent 313c84b273
commit 6fa387b2ed
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-shmobile/board-bockw.c
View File

@ -429,14 +429,12 @@ static struct asoc_simple_card_info rsnd_card_info[] = {
.card = "SSI56-AK4643", .card = "SSI56-AK4643",
.codec = "ak4642-codec.0-0012", .codec = "ak4642-codec.0-0012",
.platform = "rcar_sound", .platform = "rcar_sound",
.daifmt = SND_SOC_DAIFMT_LEFT_J, .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,
.cpu_dai = { .cpu_dai = {
.name = "rsnd-dai.0", .name = "rsnd-dai.0",
.fmt = SND_SOC_DAIFMT_CBS_CFS,
}, },
.codec_dai = { .codec_dai = {
.name = "ak4642-hifi", .name = "ak4642-hifi",
.fmt = SND_SOC_DAIFMT_CBM_CFM,
.sysclk = 11289600, .sysclk = 11289600,
}, },
}, },
@ -446,10 +444,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = {
.card = "SSI3-AK4554(playback)", .card = "SSI3-AK4554(playback)",
.codec = "ak4554-adc-dac.0", .codec = "ak4554-adc-dac.0",
.platform = "rcar_sound", .platform = "rcar_sound",
.daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J,
.cpu_dai = { .cpu_dai = {
.name = "rsnd-dai.1", .name = "rsnd-dai.1",
.fmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_RIGHT_J,
}, },
.codec_dai = { .codec_dai = {
.name = "ak4554-hifi", .name = "ak4554-hifi",
@ -461,10 +458,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = {
.card = "SSI4-AK4554(capture)", .card = "SSI4-AK4554(capture)",
.codec = "ak4554-adc-dac.0", .codec = "ak4554-adc-dac.0",
.platform = "rcar_sound", .platform = "rcar_sound",
.daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J,
.cpu_dai = { .cpu_dai = {
.name = "rsnd-dai.2", .name = "rsnd-dai.2",
.fmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_LEFT_J,
}, },
.codec_dai = { .codec_dai = {
.name = "ak4554-hifi", .name = "ak4554-hifi",
@ -476,10 +472,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = {
.card = "SSI7-AK4554(playback)", .card = "SSI7-AK4554(playback)",
.codec = "ak4554-adc-dac.1", .codec = "ak4554-adc-dac.1",
.platform = "rcar_sound", .platform = "rcar_sound",
.daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J,
.cpu_dai = { .cpu_dai = {
.name = "rsnd-dai.3", .name = "rsnd-dai.3",
.fmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_RIGHT_J,
}, },
.codec_dai = { .codec_dai = {
.name = "ak4554-hifi", .name = "ak4554-hifi",
@ -491,10 +486,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = {
.card = "SSI8-AK4554(capture)", .card = "SSI8-AK4554(capture)",
.codec = "ak4554-adc-dac.1", .codec = "ak4554-adc-dac.1",
.platform = "rcar_sound", .platform = "rcar_sound",
.daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J,
.cpu_dai = { .cpu_dai = {
.name = "rsnd-dai.4", .name = "rsnd-dai.4",
.fmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_LEFT_J,
}, },
.codec_dai = { .codec_dai = {
.name = "ak4554-hifi", .name = "ak4554-hifi",