Merge branch 'fix/misc' into topic/misc (b55ac2a1) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/ac97/ac97_patch.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1909,6 +1909,7 @@ static unsigned int ad1981_jacks_whitelist[] = {
		0x103c0944, /* HP nc6220 */
		0x103c0934, /* HP nc8220 */
		0x103c006d, /* HP nx9105 */
		0x103c300d, /* HP Compaq dc5100 SFF(PT003AW) */
		0x17340088, /* FSC Scenic-W */
		0 /* end */
		};

sound/pci/hda/alc268_quirks.c

+18 −18

Original line number	Diff line number	Diff line
		@@ -476,8 +476,8 @@ static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {

		static const struct alc_config_preset alc268_presets[] = {
		[ALC267_QUANTA_IL1] = {
		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,
		alc268_capture_nosrc_mixer },
		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_nosrc_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc267_quanta_il1_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -492,8 +492,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_3ST] = {
		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
		alc268_beep_mixer },
		.mixers = { alc268_base_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_alt_mixer,
		.init_verbs = { alc268_base_init_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		.dac_nids = alc268_dac_nids,
		@@ -507,8 +507,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.input_mux = &alc268_capture_source,
		},
		[ALC268_TOSHIBA] = {
		.mixers = { alc268_toshiba_mixer, alc268_capture_alt_mixer,
		alc268_beep_mixer },
		.mixers = { alc268_toshiba_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_alt_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_toshiba_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -525,8 +525,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_ACER] = {
		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,
		alc268_beep_mixer },
		.mixers = { alc268_acer_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_alt_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_acer_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -543,8 +543,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_ACER_DMIC] = {
		.mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,
		alc268_beep_mixer },
		.mixers = { alc268_acer_dmic_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_alt_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_acer_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -561,9 +561,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_ACER_ASPIRE_ONE] = {
		.mixers = { alc268_acer_aspire_one_mixer,
		alc268_beep_mixer,
		alc268_capture_nosrc_mixer },
		.mixers = { alc268_acer_aspire_one_mixer, alc268_beep_mixer},
		.cap_mixer = alc268_capture_nosrc_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_acer_aspire_one_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -579,8 +578,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_DELL] = {
		.mixers = { alc268_dell_mixer, alc268_beep_mixer,
		alc268_capture_nosrc_mixer },
		.mixers = { alc268_dell_mixer, alc268_beep_mixer},
		.cap_mixer = alc268_capture_nosrc_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_dell_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -596,8 +595,8 @@ static const struct alc_config_preset alc268_presets[] = {
		.init_hook = alc_inithook,
		},
		[ALC268_ZEPTO] = {
		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
		alc268_beep_mixer },
		.mixers = { alc268_base_mixer, alc268_beep_mixer },
		.cap_mixer = alc268_capture_alt_mixer,
		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
		alc268_toshiba_verbs },
		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
		@@ -616,7 +615,8 @@ static const struct alc_config_preset alc268_presets[] = {
		},
		#ifdef CONFIG_SND_DEBUG
		[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,
		alc268_volume_init_verbs,
		alc268_beep_init_verbs },

sound/pci/hda/patch_realtek.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1784,6 +1784,7 @@ static const char * const alc_slave_vols[] = {
		"Speaker Playback Volume",
		"Mono Playback Volume",
		"Line-Out Playback Volume",
		"PCM Playback Volume",
		NULL,
		};

		@@ -1798,6 +1799,7 @@ static const char * const alc_slave_sws[] = {
		"Mono Playback Switch",
		"IEC958 Playback Switch",
		"Line-Out Playback Switch",
		"PCM Playback Switch",
		NULL,
		};

sound/usb/mixer.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ static inline void check_mapped_dB(const struct usbmix_name_map *p,
		if (p && p->dB) {
		cval->dBmin = p->dB->min;
		cval->dBmax = p->dB->max;
		cval->initialized = 1;
		}
		}

		@@ -1092,7 +1093,7 @@ static void build_feature_ctl(struct mixer_build state, void raw_desc,
		" Switch" : " Volume");
		if (control == UAC_FU_VOLUME) {
		check_mapped_dB(map, cval);
		if (cval->dBmin < cval->dBmax) {
		if (cval->dBmin < cval->dBmax \|\| !cval->initialized) {
		kctl->tlv.c = mixer_vol_tlv;
		kctl->vd[0].access \|=
		SNDRV_CTL_ELEM_ACCESS_TLV_READ \|