summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-12-19 19:28:19 -0800
committerMark Brown <broonie@linaro.org>2013-12-31 13:35:30 +0000
commit52ea2a79f440740b57925e729a59337414b4c300 (patch)
treef9cbcbab2cab3ae0d0d5fea37c8a8e946b6c8779 /sound/soc
parentaf8a478821345fd264fd2294e80f5b0a28a518bc (diff)
ASoC: rsnd: INT_ENABLE is needed only Gen2
INT_ENABLE is needed only Gen2. rsnd_mod_write() do nothing on Gen1, but it is confusable. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sh/rcar/rsnd.h2
-rw-r--r--sound/soc/sh/rcar/ssi.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index a14bc9274b3f..3774dfcfaf0f 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -40,7 +40,7 @@ enum rsnd_reg {
RSND_REG_SSI_MODE0,
RSND_REG_SSI_MODE1,
RSND_REG_BUSIF_MODE,
- RSND_REG_INT_ENABLE,
+ RSND_REG_INT_ENABLE, /* for Gen2 */
RSND_REG_SRC_ADINR,
/* ADG */
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index aff5b76d1fd5..01b5cf945d61 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -457,8 +457,9 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
/* enable PIO IRQ */
ssi->cr_etc = UIEN | OIEN | DIEN;
- /* enable PIO interrupt */
- rsnd_mod_write(&ssi->mod, INT_ENABLE, 0x0f000000);
+ /* enable PIO interrupt if gen2 */
+ if (rsnd_is_gen2(priv))
+ rsnd_mod_write(&ssi->mod, INT_ENABLE, 0x0f000000);
rsnd_ssi_hw_start(ssi, rdai, io);