Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: rsnd: tidyup register naming of BUSIF_MODE 



Gen1:SRU has only 1 BUSIF_MODE,
but Gen2:SSIU/SCU has SRCm_BUSIF_MODE, and SSIn_BUSIF_MODE.
This patch rename current BUSIF_MODE to SRC_BUSIF_MODE.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

sound/soc/sh/rcar/gen.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen) 
		RSND_GEN1_S_REG(gen, SRU,	SRC_ROUTE_CTRL,	0xc0),

		RSND_GEN1_S_REG(gen, SRU,	SSI_MODE0,	0xD0),

		RSND_GEN1_S_REG(gen, SRU,	SSI_MODE1,	0xD4),

		RSND_GEN1_M_REG(gen, SRU,	BUSIF_MODE,	0x20,	0x4),

		RSND_GEN1_M_REG(gen, SRU,	SRC_BUSIF_MODE,	0x20,	0x4),

		RSND_GEN1_M_REG(gen, SRU,	SRC_ROUTE_MODE0,0x50,	0x8),

		RSND_GEN1_M_REG(gen, SRU,	SRC_SWRSR,	0x200,	0x40),

		RSND_GEN1_M_REG(gen, SRU,	SRC_SRCIR,	0x204,	0x40),

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ enum rsnd_reg { 
	RSND_REG_SRC_ROUTE_CTRL,	/* for Gen1 */

	RSND_REG_SSI_MODE0,

	RSND_REG_SSI_MODE1,

	RSND_REG_BUSIF_MODE,

	RSND_REG_INT_ENABLE,		/* for Gen2 */

	RSND_REG_SRC_BUSIF_MODE,

	RSND_REG_SRC_ROUTE_MODE0,

	RSND_REG_SRC_SWRSR,

	RSND_REG_SRC_SRCIR,

sound/soc/sh/rcar/scu.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int rsnd_scu_convert_rate_ctrl(struct rsnd_priv *priv, 
	rsnd_mod_write(mod, SRC_SRCIR, 0);



	/* use DMA transfer */

	rsnd_mod_write(mod, BUSIF_MODE, 1);

	rsnd_mod_write(mod, SRC_BUSIF_MODE, 1);



	return 0;

}