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

Commit f9bc0297 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood
Browse files

ASoC: tlv320aic3x: Fix remaining output pin switch names 



Bit 3 in output pin_CTRL register mutes the whole output pin not just the
route from DAC so remove misleading DAC from control name. Currently only
"Line[L | R] Playback Switch" were correct.

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 97e15b1f

sound/soc/codecs/tlv320aic3x.c

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { 
	SOC_DOUBLE_R_TLV("Mono DAC Playback Volume",

			 DACL1_2_MONOLOPM_VOL, DACR1_2_MONOLOPM_VOL,

			 0, 118, 1, output_stage_tlv),

	SOC_SINGLE("Mono DAC Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),

	SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),

	SOC_DOUBLE_R_TLV("Mono PGA Bypass Playback Volume",

			 PGAL_2_MONOLOPM_VOL, PGAR_2_MONOLOPM_VOL,

			 0, 118, 1, output_stage_tlv),
@@ -325,7 +325,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { 
	SOC_DOUBLE_R_TLV("HP DAC Playback Volume",

			 DACL1_2_HPLOUT_VOL, DACR1_2_HPROUT_VOL,

			 0, 118, 1, output_stage_tlv),

	SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,

	SOC_DOUBLE_R("HP Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,

		     0x01, 0),

	SOC_DOUBLE_R_TLV("HP Right PGA Bypass Playback Volume",

			 PGAR_2_HPLOUT_VOL, PGAR_2_HPROUT_VOL,
@@ -341,7 +341,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { 
	SOC_DOUBLE_R_TLV("HPCOM DAC Playback Volume",

			 DACL1_2_HPLCOM_VOL, DACR1_2_HPRCOM_VOL,

			 0, 118, 1, output_stage_tlv),

	SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,

	SOC_DOUBLE_R("HPCOM Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,

		     0x01, 0),

	SOC_SINGLE_TLV("HPLCOM PGA Bypass Playback Volume",

		       PGAL_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),