diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-03-13 20:56:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-14 15:34:10 -0400 |
commit | e1508289404ab6ca28e0dc931612600f0441c417 (patch) | |
tree | 3ce76913338f66153452481fb3e337e022c7bc3c | |
parent | c7a507eea1db1430476289f525f9c853d5d485e8 (diff) |
ASoC: rcar: 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>
-rw-r--r-- | sound/soc/sh/rcar/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 743de5e3b1e1..3a4fe9d0d4f2 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -486,10 +486,10 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
486 | /* set master/slave audio interface */ | 486 | /* set master/slave audio interface */ |
487 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { | 487 | switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
488 | case SND_SOC_DAIFMT_CBM_CFM: | 488 | case SND_SOC_DAIFMT_CBM_CFM: |
489 | rdai->clk_master = 1; | 489 | rdai->clk_master = 0; |
490 | break; | 490 | break; |
491 | case SND_SOC_DAIFMT_CBS_CFS: | 491 | case SND_SOC_DAIFMT_CBS_CFS: |
492 | rdai->clk_master = 0; | 492 | rdai->clk_master = 1; /* codec is slave, cpu is master */ |
493 | break; | 493 | break; |
494 | default: | 494 | default: |
495 | return -EINVAL; | 495 | return -EINVAL; |