Commit efa991dc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: rename INT_ENABLE to SSI_INT_ENABLE 



based on datasheet

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cdde84d1

sound/soc/sh/rcar/gen.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev, 
		RSND_GEN_M_REG(SSI_BUSIF_ADINR,	0x4,	0x80),

		RSND_GEN_M_REG(SSI_BUSIF_DALIGN,0x8,	0x80),

		RSND_GEN_M_REG(SSI_CTRL,	0x10,	0x80),

		RSND_GEN_M_REG(INT_ENABLE,	0x18,	0x80),

		RSND_GEN_M_REG(SSI_INT_ENABLE,	0x18,	0x80),

	};

	struct rsnd_regmap_field_conf conf_scu[] = {

		RSND_GEN_M_REG(SRC_BUSIF_MODE,	0x0,	0x20),

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ enum rsnd_reg { 
#define RSND_REG_SSI_CTRL		RSND_REG_SHARE02

#define RSND_REG_SSI_BUSIF_MODE		RSND_REG_SHARE03

#define RSND_REG_SSI_BUSIF_ADINR	RSND_REG_SHARE04

#define RSND_REG_INT_ENABLE		RSND_REG_SHARE05

#define RSND_REG_SSI_INT_ENABLE		RSND_REG_SHARE05

#define RSND_REG_SRC_BSDSR		RSND_REG_SHARE06

#define RSND_REG_SRC_BSISR		RSND_REG_SHARE07

#define RSND_REG_DIV_EN			RSND_REG_SHARE08

sound/soc/sh/rcar/src.c

+4 −5
Original line number Diff line number Diff line
@@ -215,10 +215,9 @@ int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod) 
		return 0;



	/* enable SSI interrupt if Gen2 */

	if (rsnd_ssi_is_dma_mode(ssi_mod))

		rsnd_mod_write(ssi_mod, INT_ENABLE, 0x0e000000);

	else

		rsnd_mod_write(ssi_mod, INT_ENABLE, 0x0f000000);

	rsnd_mod_write(ssi_mod, SSI_INT_ENABLE,

		       rsnd_ssi_is_dma_mode(ssi_mod) ?

		       0x0e000000 : 0x0f000000);



	return 0;

}
@@ -231,7 +230,7 @@ int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod) 
		return 0;



	/* disable SSI interrupt if Gen2 */

	rsnd_mod_write(ssi_mod, INT_ENABLE, 0x00000000);

	rsnd_mod_write(ssi_mod, SSI_INT_ENABLE, 0x00000000);



	return 0;

}