aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-12-19 22:28:19 -0500
committerMark Brown <broonie@linaro.org>2013-12-31 08:35:30 -0500
commit52ea2a79f440740b57925e729a59337414b4c300 (patch)
treef9cbcbab2cab3ae0d0d5fea37c8a8e946b6c8779 /sound
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')
-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 {
40 RSND_REG_SSI_MODE0, 40 RSND_REG_SSI_MODE0,
41 RSND_REG_SSI_MODE1, 41 RSND_REG_SSI_MODE1,
42 RSND_REG_BUSIF_MODE, 42 RSND_REG_BUSIF_MODE,
43 RSND_REG_INT_ENABLE, 43 RSND_REG_INT_ENABLE, /* for Gen2 */
44 RSND_REG_SRC_ADINR, 44 RSND_REG_SRC_ADINR,
45 45
46 /* ADG */ 46 /* 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,
457 /* enable PIO IRQ */ 457 /* enable PIO IRQ */
458 ssi->cr_etc = UIEN | OIEN | DIEN; 458 ssi->cr_etc = UIEN | OIEN | DIEN;
459 459
460 /* enable PIO interrupt */ 460 /* enable PIO interrupt if gen2 */
461 rsnd_mod_write(&ssi->mod, INT_ENABLE, 0x0f000000); 461 if (rsnd_is_gen2(priv))
462 rsnd_mod_write(&ssi->mod, INT_ENABLE, 0x0f000000);
462 463
463 rsnd_ssi_hw_start(ssi, rdai, io); 464 rsnd_ssi_hw_start(ssi, rdai, io);
464 465