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

Commit c40bd914 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - avoid non-standard "Docking" name in mixers 



The standard name (and what PulseAudio picks up) is "Dock Mic",
not "Docking Mic" or "Docking-Station".

Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 384dc085

sound/pci/hda/patch_analog.c

+7 −7
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ static const struct hda_input_mux ad1981_hp_capture_source = { 
	.num_items = 3,

	.items = {

		{ "Mic", 0x0 },

		{ "Docking-Station", 0x1 },

		{ "Dock Mic", 0x1 },

		{ "Mix", 0x2 },

	},

};
@@ -1834,8 +1834,8 @@ static const struct snd_kcontrol_new ad1981_hp_mixers[] = { 
	 */

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Docking-Station Playback Volume", 0x13, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Docking-Station Playback Switch", 0x13, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),

	/* FIXME: does this laptop have analog CD connection? */
@@ -3565,7 +3565,7 @@ static const struct hda_amp_list ad1884_loopbacks[] = { 


static const char * const ad1884_slave_vols[] = {

	"PCM", "Mic", "Mono", "Front Mic", "Mic", "CD",

	"Internal Mic", "Docking Mic", /* "Beep", */ "IEC958",

	"Internal Mic", "Dock Mic", /* "Beep", */ "IEC958",

	NULL

};
@@ -3626,7 +3626,7 @@ static const struct hda_input_mux ad1984_thinkpad_capture_source = { 
		{ "Mic", 0x0 },

		{ "Internal Mic", 0x1 },

		{ "Mix", 0x3 },

		{ "Docking-Station", 0x4 },

		{ "Dock Mic", 0x4 },

	},

};
@@ -3655,8 +3655,8 @@ static const struct snd_kcontrol_new ad1984_thinkpad_mixers[] = { 
	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),

	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),

	HDA_CODEC_VOLUME("Docking Mic Playback Volume", 0x20, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("Docking Mic Playback Switch", 0x20, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Boost Volume", 0x14, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x15, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Dock Mic Boost Volume", 0x25, 0x0, HDA_OUTPUT),

sound/pci/hda/patch_conexant.c

+2 −2
Original line number Diff line number Diff line
@@ -1710,8 +1710,8 @@ static const struct snd_kcontrol_new cxt5051_capture_mixers[] = { 
	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Switch", 0x14, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Docking Mic Volume", 0x15, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Docking Mic Switch", 0x15, 0x00, HDA_INPUT),

	HDA_CODEC_VOLUME("Dock Mic Volume", 0x15, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Dock Mic Switch", 0x15, 0x00, HDA_INPUT),

	{}

};