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

Commit 49797926 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/alc268_quirks.c
parents 082632e2 c503ad46

sound/pci/hda/alc268_quirks.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -397,8 +397,8 @@ static const struct snd_pci_quirk alc268_cfg_tbl[] = { 




static const struct alc_config_preset alc268_presets[] = {

static const struct alc_config_preset alc268_presets[] = {

	[ALC267_QUANTA_IL1] = {

	[ALC267_QUANTA_IL1] = {

		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,

		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },

			    alc268_capture_nosrc_mixer },

		.cap_mixer = alc268_capture_nosrc_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),
@@ -413,8 +413,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

		.init_hook = alc_inithook,

	},

	},

	[ALC268_3ST] = {

	[ALC268_3ST] = {

		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,

		.mixers = { alc268_base_mixer, alc268_beep_mixer },

			    alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs },

		.init_verbs = { alc268_base_init_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.dac_nids = alc268_dac_nids,

		.dac_nids = alc268_dac_nids,
@@ -428,8 +428,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.input_mux = &alc268_capture_source,

		.input_mux = &alc268_capture_source,

	},

	},

	[ALC268_ACER] = {

	[ALC268_ACER] = {

		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,

		.mixers = { alc268_acer_mixer, alc268_beep_mixer },

			    alc268_beep_mixer },

		.cap_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_verbs },

				alc268_acer_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -446,8 +446,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

		.init_hook = alc_inithook,

	},

	},

	[ALC268_ACER_DMIC] = {

	[ALC268_ACER_DMIC] = {

		.mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,

		.mixers = { alc268_acer_dmic_mixer, alc268_beep_mixer },

			    alc268_beep_mixer },

		.cap_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_verbs },

				alc268_acer_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -464,9 +464,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

		.init_hook = alc_inithook,

	},

	},

	[ALC268_ACER_ASPIRE_ONE] = {

	[ALC268_ACER_ASPIRE_ONE] = {

		.mixers = { alc268_acer_aspire_one_mixer,

		.mixers = { alc268_acer_aspire_one_mixer, alc268_beep_mixer},

			    alc268_beep_mixer,

		.cap_mixer = alc268_capture_nosrc_mixer,

			    alc268_capture_nosrc_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 },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -483,7 +482,8 @@ static const struct alc_config_preset alc268_presets[] = { 
	},

	},

#ifdef CONFIG_SND_DEBUG

#ifdef CONFIG_SND_DEBUG

	[ALC268_TEST] = {

	[ALC268_TEST] = {

		.mixers = { alc268_test_mixer, alc268_capture_mixer },

		.mixers = { alc268_test_mixer },

		.cap_mixer = alc268_capture_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_volume_init_verbs,

				alc268_volume_init_verbs,

				alc268_beep_init_verbs },

				alc268_beep_init_verbs },