diff options
| author | Kuninori Morimoto | 2016-02-18 09:18:16 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-02-19 16:53:02 +0100 |
| commit | 615fb6c7b13b7f142f5f8e23e5f8593dd1e7b319 (patch) | |
| tree | 749064dc6182fa7ce48d2554495a0fb9ae04cde6 /sound | |
| parent | ASoC: rsnd: Parent SSI attach is not needed if not clock master (diff) | |
| download | kernel-qcow2-linux-615fb6c7b13b7f142f5f8e23e5f8593dd1e7b319.tar.gz kernel-qcow2-linux-615fb6c7b13b7f142f5f8e23e5f8593dd1e7b319.tar.xz kernel-qcow2-linux-615fb6c7b13b7f142f5f8e23e5f8593dd1e7b319.zip | |
ASoC: rsnd: move rsnd_ssi_irq() position
prepare for runtime judging for SSI work
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index b5c6f0c274c3..d46bc08ad977 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -144,27 +144,6 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod, rsnd_mod_name(mod), rsnd_mod_id(mod)); } -static int rsnd_ssi_irq(struct rsnd_mod *mod, - struct rsnd_dai_stream *io, - struct rsnd_priv *priv, - int enable) -{ - u32 val = 0; - - if (rsnd_is_gen1(priv)) - return 0; - - if (rsnd_ssi_is_parent(mod, io)) - return 0; - - if (enable) - val = rsnd_ssi_is_dma_mode(mod) ? 0x0e000000 : 0x0f000000; - - rsnd_mod_write(mod, SSI_INT_ENABLE, val); - - return 0; -} - u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) { struct rsnd_mod *mod; @@ -480,6 +459,27 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, return 0; } +static int rsnd_ssi_irq(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv, + int enable) +{ + u32 val = 0; + + if (rsnd_is_gen1(priv)) + return 0; + + if (rsnd_ssi_is_parent(mod, io)) + return 0; + + if (enable) + val = rsnd_ssi_is_dma_mode(mod) ? 0x0e000000 : 0x0f000000; + + rsnd_mod_write(mod, SSI_INT_ENABLE, val); + + return 0; +} + static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { |