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

Commit bb7927c7 authored Oct 26, 2016 by Kuninori Morimoto Committed by Mark Brown Oct 26, 2016

ASoC: rsnd: rsnd_reg cleanup for SSIU



R-Car Gen1 didn't have SSIU IP, and it was part of SRU.
In Gen2, SSIU was created and it has original register.
Let's cleanup rsnd_reg for SSIU, because this driver
doesn't support Gen1 SRU any more.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f0b20e71

sound/soc/sh/rcar/rsnd.h

+13 −11

Original line number	Original line	Diff line number	Diff line
	@@ -43,17 +43,7 @@
	* see gen1/gen2 for detail		* see gen1/gen2 for detail
	*/		*/
	enum rsnd_reg {		enum rsnd_reg {
	/* SCU (SRC/SSIU/MIX/CTU/DVC) */		/* SCU (MIX/CTU/DVC) */
	RSND_REG_SSI_MODE,
	RSND_REG_SSI_MODE0,
	RSND_REG_SSI_MODE1,
	RSND_REG_SSI_MODE2,
	RSND_REG_SSI_CONTROL,
	RSND_REG_SSI_CTRL,
	RSND_REG_SSI_BUSIF_MODE,
	RSND_REG_SSI_BUSIF_ADINR,
	RSND_REG_SSI_BUSIF_DALIGN,
	RSND_REG_SSI_INT_ENABLE,
	RSND_REG_SRC_I_BUSIF_MODE,		RSND_REG_SRC_I_BUSIF_MODE,
	RSND_REG_SRC_O_BUSIF_MODE,		RSND_REG_SRC_O_BUSIF_MODE,
	RSND_REG_SRC_ROUTE_MODE0,		RSND_REG_SRC_ROUTE_MODE0,
	@@ -160,6 +150,18 @@ enum rsnd_reg {
	RSND_REG_AUDIO_CLK_SEL1,		RSND_REG_AUDIO_CLK_SEL1,
	RSND_REG_AUDIO_CLK_SEL2,		RSND_REG_AUDIO_CLK_SEL2,

			/* SSIU */
			RSND_REG_SSI_MODE,
			RSND_REG_SSI_MODE0,
			RSND_REG_SSI_MODE1,
			RSND_REG_SSI_MODE2,
			RSND_REG_SSI_CONTROL,
			RSND_REG_SSI_CTRL,
			RSND_REG_SSI_BUSIF_MODE,
			RSND_REG_SSI_BUSIF_ADINR,
			RSND_REG_SSI_BUSIF_DALIGN,
			RSND_REG_SSI_INT_ENABLE,

	/* SSI */		/* SSI */
	RSND_REG_SSICR,		RSND_REG_SSICR,
	RSND_REG_SSISR,		RSND_REG_SSISR,