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

Commit 22971e3a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - add digital beep support for ALC268 



Added the digital beep support for ALC268.  It was missing in the
last patches.

However, ALC268 has a strange pin use for widget 0x1d, which could be
used as another purpose.  So, the patch adds a check of the beep control
before creating the hook for input layer.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dea0a509

sound/pci/hda/patch_realtek.c

+22 −6
Original line number Original line Diff line number Diff line
@@ -11885,7 +11885,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { 
















static struct alc_config_preset alc268_presets[] = {







static struct alc_config_preset alc268_presets[] = {











	[ALC267_QUANTA_IL1] = {







	[ALC267_QUANTA_IL1] = {











		.mixers = { alc267_quanta_il1_mixer },







		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },











		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,







		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,











				alc267_quanta_il1_verbs },







				alc267_quanta_il1_verbs },











		.num_dacs = ARRAY_SIZE(alc268_dac_nids),







		.num_dacs = ARRAY_SIZE(alc268_dac_nids),










@@ -11967,6 +11967,7 @@ static struct alc_config_preset alc268_presets[] = {









	},







	},











	[ALC268_ACER_ASPIRE_ONE] = {







	[ALC268_ACER_ASPIRE_ONE] = {











		.mixers = { alc268_acer_aspire_one_mixer,







		.mixers = { alc268_acer_aspire_one_mixer,














			    alc268_beep_mixer,











			    alc268_capture_alt_mixer },







			    alc268_capture_alt_mixer },











		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,







		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,











				alc268_acer_aspire_one_verbs },







				alc268_acer_aspire_one_verbs },










@@ -12036,7 +12037,7 @@ static int patch_alc268(struct hda_codec *codec)









{







{











	struct alc_spec *spec;







	struct alc_spec *spec;











	int board_config;







	int board_config;











	int err;







	int i, has_beep, err;



























	spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);







	spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);











	if (spec == NULL)







	if (spec == NULL)










@@ -12091,6 +12092,20 @@ static int patch_alc268(struct hda_codec *codec)

























	spec->stream_digital_playback = &alc268_pcm_digital_playback;







	spec->stream_digital_playback = &alc268_pcm_digital_playback;






























	has_beep = 0;














	for (i = 0; i < spec->num_mixers; i++) {














		if (spec->mixers[i] == alc268_beep_mixer) {














			has_beep = 1;














			break;














		}














	}



























	if (has_beep) {














		err = snd_hda_attach_beep_device(codec, 0x1);














		if (err < 0) {














			alc_free(codec);














			return err;














		}











		if (!query_amp_caps(codec, 0x1d, HDA_INPUT))







		if (!query_amp_caps(codec, 0x1d, HDA_INPUT))











			/* override the amp caps for beep generator */







			/* override the amp caps for beep generator */











			snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,







			snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,









@@ -12098,6 +12113,7 @@ static int patch_alc268(struct hda_codec *codec)









					  (0x0c << AC_AMPCAP_NUM_STEPS_SHIFT) |







					  (0x0c << AC_AMPCAP_NUM_STEPS_SHIFT) |











					  (0x07 << AC_AMPCAP_STEP_SIZE_SHIFT) |







					  (0x07 << AC_AMPCAP_STEP_SIZE_SHIFT) |











					  (0 << AC_AMPCAP_MUTE_SHIFT));







					  (0 << AC_AMPCAP_MUTE_SHIFT));














	}



























	if (!spec->adc_nids && spec->input_mux) {







	if (!spec->adc_nids && spec->input_mux) {











		/* check whether NID 0x07 is valid */







		/* check whether NID 0x07 is valid */