| From 903bcf506d04ce9bd5fc8ccffb2357f5cff39536 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 13 Mar 2014 17:56:43 -0700 |
| Subject: 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> |
| (cherry picked from commit e1508289404ab6ca28e0dc931612600f0441c417) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index 6a1b45df8101..d836e8a9fdce 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -510,10 +510,10 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) |
| /* set master/slave audio interface */ |
| switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { |
| case SND_SOC_DAIFMT_CBM_CFM: |
| - rdai->clk_master = 1; |
| + rdai->clk_master = 0; |
| break; |
| case SND_SOC_DAIFMT_CBS_CFS: |
| - rdai->clk_master = 0; |
| + rdai->clk_master = 1; /* codec is slave, cpu is master */ |
| break; |
| default: |
| return -EINVAL; |
| -- |
| 2.1.2 |
| |
