ARM: bockw: fixup SND_SOC_DAIFMT_CBx_CFx flags

Commit Message

Kuninori Morimoto March 24, 2014, 3:27 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

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 <[e-mail]>
---
>> Mark, Simon

I'm so sorry. current Mark's fix/rcar branch has
SND_SOC_DAIFMT_CBx_CFx fixup patches,
but it didn't care about bockw board.
This patch is for it.
This Subject is using "ARM: bockw:" prefix,
but, should it be "ASoC: rcar" ?

 arch/arm/mach-shmobile/board-bockw.c |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

Comments

Kuninori Morimoto March 24, 2014, 3:33 a.m. UTC | #1

Hi Mark, Simon again

> From: Kuninori Morimoto <[e-mail]>
> 
> 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 <[e-mail]>
> ---
> >> Mark, Simon
> 
> I'm so sorry. current Mark's fix/rcar branch has
> SND_SOC_DAIFMT_CBx_CFx fixup patches,
> but it didn't care about bockw board.
> This patch is for it.
> This Subject is using "ARM: bockw:" prefix,
> but, should it be "ASoC: rcar" ?

>> Simon

Lager board needs similar patch,
but, it is not in linus/master branch yet.
I will send it to SH-ARM ML.
But, linus/master branch already has bockw board.

Mark Brown March 24, 2014, 10:41 a.m. UTC | #2

On Sun, Mar 23, 2014 at 08:27:30PM -0700, Kuninori Morimoto wrote:

> This Subject is using "ARM: bockw:" prefix,
> but, should it be "ASoC: rcar" ?

No, this is good - applied, thanks.

Patch

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index b5867b7..f444be2 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -467,14 +467,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,
 		},
 	},
@@ -484,10 +482,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",
@@ -499,10 +496,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",
@@ -514,10 +510,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",
@@ -529,10 +524,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",