| From 3317b449658df68e23de7f75ca7dea6375f59028 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 23 Mar 2014 20:27:30 -0700 |
| Subject: 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> |
| (cherry picked from commit 6fa387b2ed268952d50940b0e24c573063a1dcfe) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 16 +++++----------- |
| 1 file changed, 5 insertions(+), 11 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index aaed215e96b9..b4122f8cb8d9 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -450,14 +450,12 @@ static struct asoc_simple_card_info rsnd_card_info[] = { |
| .card = "SSI56-AK4643", |
| .codec = "ak4642-codec.0-0012", |
| .platform = "rcar_sound", |
| - .daifmt = SND_SOC_DAIFMT_LEFT_J, |
| + .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, |
| .cpu_dai = { |
| .name = "rsnd-dai.0", |
| - .fmt = SND_SOC_DAIFMT_CBS_CFS, |
| }, |
| .codec_dai = { |
| .name = "ak4642-hifi", |
| - .fmt = SND_SOC_DAIFMT_CBM_CFM, |
| .sysclk = 11289600, |
| }, |
| }, |
| @@ -467,10 +465,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { |
| .card = "SSI3-AK4554(playback)", |
| .codec = "ak4554-adc-dac.0", |
| .platform = "rcar_sound", |
| + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J, |
| .cpu_dai = { |
| .name = "rsnd-dai.1", |
| - .fmt = SND_SOC_DAIFMT_CBM_CFM | |
| - SND_SOC_DAIFMT_RIGHT_J, |
| }, |
| .codec_dai = { |
| .name = "ak4554-hifi", |
| @@ -482,10 +479,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { |
| .card = "SSI4-AK4554(capture)", |
| .codec = "ak4554-adc-dac.0", |
| .platform = "rcar_sound", |
| + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J, |
| .cpu_dai = { |
| .name = "rsnd-dai.2", |
| - .fmt = SND_SOC_DAIFMT_CBM_CFM | |
| - SND_SOC_DAIFMT_LEFT_J, |
| }, |
| .codec_dai = { |
| .name = "ak4554-hifi", |
| @@ -497,10 +493,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { |
| .card = "SSI7-AK4554(playback)", |
| .codec = "ak4554-adc-dac.1", |
| .platform = "rcar_sound", |
| + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J, |
| .cpu_dai = { |
| .name = "rsnd-dai.3", |
| - .fmt = SND_SOC_DAIFMT_CBM_CFM | |
| - SND_SOC_DAIFMT_RIGHT_J, |
| }, |
| .codec_dai = { |
| .name = "ak4554-hifi", |
| @@ -512,10 +507,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { |
| .card = "SSI8-AK4554(capture)", |
| .codec = "ak4554-adc-dac.1", |
| .platform = "rcar_sound", |
| + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J, |
| .cpu_dai = { |
| .name = "rsnd-dai.4", |
| - .fmt = SND_SOC_DAIFMT_CBM_CFM | |
| - SND_SOC_DAIFMT_LEFT_J, |
| }, |
| .codec_dai = { |
| .name = "ak4554-hifi", |
| -- |
| 2.1.2 |
| |
