diff options
author | Petr Kulhavy <brain@jikos.cz> | 2016-10-03 10:40:50 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-10-03 23:21:56 -0400 |
commit | 960695670502afa153c2294e15ca790dbe086f4d (patch) | |
tree | 66d8fb920708d68b39c739f5b8b99d6600adff15 | |
parent | 5e549a0c18fc0321c18e7b6842cb7afc90aab396 (diff) |
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: Petr Kulhavy <brain@jikos.cz>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/tas571x.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c index de65ecf534af..34e4ce6f23d8 100644 --- a/sound/soc/codecs/tas571x.c +++ b/sound/soc/codecs/tas571x.c | |||
@@ -401,16 +401,6 @@ static const struct snd_kcontrol_new tas5711_controls[] = { | |||
401 | TAS571X_SOFT_MUTE_REG, | 401 | TAS571X_SOFT_MUTE_REG, |
402 | TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT, | 402 | TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT, |
403 | 1, 1), | 403 | 1, 1), |
404 | |||
405 | SOC_DOUBLE_R_RANGE("CH1 Mixer Volume", | ||
406 | TAS5717_CH1_LEFT_CH_MIX_REG, | ||
407 | TAS5717_CH1_RIGHT_CH_MIX_REG, | ||
408 | 16, 0, 0x80, 0), | ||
409 | |||
410 | SOC_DOUBLE_R_RANGE("CH2 Mixer Volume", | ||
411 | TAS5717_CH2_LEFT_CH_MIX_REG, | ||
412 | TAS5717_CH2_RIGHT_CH_MIX_REG, | ||
413 | 16, 0, 0x80, 0), | ||
414 | }; | 404 | }; |
415 | 405 | ||
416 | static const struct regmap_range tas571x_readonly_regs_range[] = { | 406 | static const struct regmap_range tas571x_readonly_regs_range[] = { |
@@ -488,6 +478,16 @@ static const struct snd_kcontrol_new tas5717_controls[] = { | |||
488 | TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT, | 478 | TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT, |
489 | 1, 1), | 479 | 1, 1), |
490 | 480 | ||
481 | SOC_DOUBLE_R_RANGE("CH1 Mixer Volume", | ||
482 | TAS5717_CH1_LEFT_CH_MIX_REG, | ||
483 | TAS5717_CH1_RIGHT_CH_MIX_REG, | ||
484 | 16, 0, 0x80, 0), | ||
485 | |||
486 | SOC_DOUBLE_R_RANGE("CH2 Mixer Volume", | ||
487 | TAS5717_CH2_LEFT_CH_MIX_REG, | ||
488 | TAS5717_CH2_RIGHT_CH_MIX_REG, | ||
489 | 16, 0, 0x80, 0), | ||
490 | |||
491 | /* | 491 | /* |
492 | * The biquads are named according to the register names. | 492 | * The biquads are named according to the register names. |
493 | * Please note that TI's TAS57xx Graphical Development Environment | 493 | * Please note that TI's TAS57xx Graphical Development Environment |