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

Commit 96069567 authored by Petr Kulhavy's avatar Petr Kulhavy Committed by Mark Brown
Browse files

ASoC: tas571x: move mixer volume controls from TAS5711 to TAS5717 



Channel 1 and 2 Mixer Volume controls (registers 0x72/0x73 and 0x76/0x77)
were wrongly assigned to tas5711_controls in commit f252d2346022
("ASoC: tas571x: add input channel mixer for TAS5717/19")

Therefore move them to tas5717_controls.

Signed-off-by: default avatarPetr Kulhavy <brain@jikos.cz>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5e549a0c

sound/soc/codecs/tas571x.c

+10 −10
Original line number Diff line number Diff line
@@ -401,16 +401,6 @@ static const struct snd_kcontrol_new tas5711_controls[] = { 
		   TAS571X_SOFT_MUTE_REG,

		   TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,

		   1, 1),



	SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",

			   TAS5717_CH1_LEFT_CH_MIX_REG,

			   TAS5717_CH1_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",

			   TAS5717_CH2_LEFT_CH_MIX_REG,

			   TAS5717_CH2_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),

};



static const struct regmap_range tas571x_readonly_regs_range[] = {
@@ -488,6 +478,16 @@ static const struct snd_kcontrol_new tas5717_controls[] = { 
		   TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,

		   1, 1),



	SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",

			   TAS5717_CH1_LEFT_CH_MIX_REG,

			   TAS5717_CH1_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",

			   TAS5717_CH2_LEFT_CH_MIX_REG,

			   TAS5717_CH2_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	/*

	 * The biquads are named according to the register names.

	 * Please note that TI's TAS57xx Graphical Development Environment