[PATCH 1/1][SRU][OEM-5.10/H] UBUNTU: SAUCE: ALSA: hda/cirrus: Set Initial DMIC volume to -26 dB

[You-Sheng Yang]

From: Stefan Binding <sbinding at opensource.cirrus.com>

BugLink: https://bugs.launchpad.net/bugs/1929803

Previously this fix was applied only to Bullseye variant laptops,
and should be applied to Cyborg and Warlock variants.

Fixes: 45b14fe200ba ("ALSA: hda/cirrus: Use CS8409 filter to fix abnormal sounds on Bullseye")
Signed-off-by: Stefan Binding <sbinding at opensource.cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr at opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210531163754.136736-1-vitalyr@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai at suse.de>
(backported from
https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=527ff9550682a3d08066a000435ffd8330bdd729)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 sound/pci/hda/patch_cirrus.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 6054f6a193f6..73ef0693059b 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -2215,10 +2215,9 @@ static int cs8409_cs42l42_fixup(struct hda_codec *codec)
 	if (err < 0)
 		return err;
 
-	/* Set initial volume on Bullseye to -26 dB */
-	if (codec->fixup_id == CS8409_BULLSEYE)
-		snd_hda_codec_amp_init_stereo(codec, CS8409_CS42L42_DMIC_ADC_PIN_NID,
-				HDA_INPUT, 0, 0xff, 0x19);
+	/* Set initial DMIC volume to -26 dB */
+	snd_hda_codec_amp_init_stereo(codec, CS8409_CS42L42_DMIC_ADC_PIN_NID,
+			HDA_INPUT, 0, 0xff, 0x19);
 
 	if (!snd_hda_gen_add_kctl(
 			&spec->gen, NULL, &cs8409_cs42l42_hp_volume_mixer))
-- 
2.30.2