diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-25 08:54:58 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-05 07:27:27 +0300 |
| commit | eed76bb811cd143119b4bdeca88606685222e687 (patch) | |
| tree | 184d6bdd8bec79e9e0fab8ce178e470e01810bc4 /sound/soc/sh/rcar/mix.c | |
| parent | 8a3a2211e97395694827f12552bbad7f2caf11ef (diff) | |
| download | linux-eed76bb811cd143119b4bdeca88606685222e687.tar.xz | |
ASoC: rsnd: add rsnd_runtime_channel_xxx()
Current SSI is supporting Normal SSI/Multi mode SSI/TDM mode SSI
and its behavior is based on input channels.
This input channel might be converted by CTU,
and SSI needs to be Multi SSI mode / TDM SSI mode if 6ch input
EX) 6ch input, CTU for 2ch, playback
6ch 6ch 2ch 2ch 2ch 2ch
-> SRC -> CTU -> MIX -> DVC -> SSIU -> SSI
EX) 6ch input, no CTU, Multi SSI, playback
6ch 6ch 6ch 6ch 6ch 2ch
-> SRC -> CTU -> MIX -> DVC -> SSIU -> SSI0/SSI1/SSI2
Current driver is using rsnd_get_adinr_chan() / rsnd_get_slot_width()
for this purpose, but it is complicated enough without meaning.
This patch adds new rsnd_runtime_channel_xxx() which is caring
CTU/Multi SSI.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/mix.c')
| -rw-r--r-- | sound/soc/sh/rcar/mix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c index e0e337ad4206..195fc7bb22af 100644 --- a/sound/soc/sh/rcar/mix.c +++ b/sound/soc/sh/rcar/mix.c @@ -51,7 +51,7 @@ static void rsnd_mix_volume_init(struct rsnd_dai_stream *io, rsnd_mod_write(mod, MIX_MIXIR, 1); /* General Information */ - rsnd_mod_write(mod, MIX_ADINR, rsnd_get_adinr_chan(mod, io)); + rsnd_mod_write(mod, MIX_ADINR, rsnd_runtime_channel_after_ctu(io)); /* volume step */ rsnd_mod_write(mod, MIX_MIXMR, 0); |