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

Commit 690ef81e authored Dec 19, 2013 by Kuninori Morimoto Committed by Mark Brown Dec 31, 2013

ASoC: rsnd: tidyup register naming



Use correct register name which appears in the datasheet

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

parent 729aca51

sound/soc/sh/rcar/gen.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -314,11 +314,11 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv priv, struct rsnd_gen gen)
	RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL0, 0x08),		RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL0, 0x08),
	RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL1, 0x0c),		RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL1, 0x0c),
	RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL2, 0x10),		RSND_GEN1_S_REG(gen, SRU, SRC_TMG_SEL2, 0x10),
	RSND_GEN1_S_REG(gen, SRU, SRC_CTRL, 0xc0),		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_MODE0, 0xD0),
	RSND_GEN1_S_REG(gen, SRU, SSI_MODE1, 0xD4),		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, BUSIF_MODE, 0x20, 0x4),
	RSND_GEN1_M_REG(gen, SRU, BUSIF_ADINR, 0x214, 0x40),		RSND_GEN1_M_REG(gen, SRU, SRC_ADINR, 0x214, 0x40),

	RSND_GEN1_S_REG(gen, ADG, BRRA, 0x00),		RSND_GEN1_S_REG(gen, ADG, BRRA, 0x00),
	RSND_GEN1_S_REG(gen, ADG, BRRB, 0x04),		RSND_GEN1_S_REG(gen, ADG, BRRB, 0x04),

sound/soc/sh/rcar/rsnd.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36,12 +36,12 @@ enum rsnd_reg {
	RSND_REG_SRC_TMG_SEL0,		RSND_REG_SRC_TMG_SEL0,
	RSND_REG_SRC_TMG_SEL1,		RSND_REG_SRC_TMG_SEL1,
	RSND_REG_SRC_TMG_SEL2,		RSND_REG_SRC_TMG_SEL2,
	RSND_REG_SRC_CTRL,		RSND_REG_SRC_ROUTE_CTRL,
	RSND_REG_SSI_MODE0,		RSND_REG_SSI_MODE0,
	RSND_REG_SSI_MODE1,		RSND_REG_SSI_MODE1,
	RSND_REG_BUSIF_MODE,		RSND_REG_BUSIF_MODE,
	RSND_REG_BUSIF_ADINR,
	RSND_REG_INT_ENABLE,		RSND_REG_INT_ENABLE,
			RSND_REG_SRC_ADINR,

	/* ADG */		/* ADG */
	RSND_REG_BRRA,		RSND_REG_BRRA,

sound/soc/sh/rcar/scu.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,7 @@ static int rsnd_scu_set_mode(struct rsnd_priv *priv,

	if (rsnd_is_gen1(priv)) {		if (rsnd_is_gen1(priv)) {
	val = (1 << id);		val = (1 << id);
	rsnd_mod_bset(mod, SRC_CTRL, val, val);		rsnd_mod_bset(mod, SRC_ROUTE_CTRL, val, val);
	}		}

	return 0;		return 0;
	@@ -141,7 +141,7 @@ static int rsnd_scu_set_hpbif(struct rsnd_priv *priv,
	}		}

	rsnd_mod_write(mod, BUSIF_MODE, 1);		rsnd_mod_write(mod, BUSIF_MODE, 1);
	rsnd_mod_write(mod, BUSIF_ADINR, adinr);		rsnd_mod_write(mod, SRC_ADINR, adinr);

	return 0;		return 0;
	}		}