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

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

ALSA: HDA: Rename "Ext Mic" and "External Mic" to "Mic" 



Usually external microphones are just labelled "Mic", so rename
"Ext Mic" and "External Mic" to "Mic" to clear up the namespace.

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

sound/pci/hda/patch_conexant.c

+14 −14
Original line number Diff line number Diff line
@@ -871,14 +871,14 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec, 
static struct snd_kcontrol_new cxt5045_mixers[] = {

	HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x17, 0x2, HDA_INPUT),

	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -912,14 +912,14 @@ static struct snd_kcontrol_new cxt5045_benq_mixers[] = { 
static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {

	HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x17, 0x1, HDA_INPUT),

	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1796,8 +1796,8 @@ static struct snd_kcontrol_new cxt5051_playback_mixers[] = { 
static struct snd_kcontrol_new cxt5051_capture_mixers[] = {

	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),

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

	HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, 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),

	{}
@@ -1806,8 +1806,8 @@ static struct snd_kcontrol_new cxt5051_capture_mixers[] = { 
static struct snd_kcontrol_new cxt5051_hp_mixers[] = {

	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),

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

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

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

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

	{}

};
@@ -1826,8 +1826,8 @@ static struct snd_kcontrol_new cxt5051_f700_mixers[] = { 
static struct snd_kcontrol_new cxt5051_toshiba_mixers[] = {

	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),

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

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

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

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

	{}

};

sound/pci/hda/patch_realtek.c

+13 −13
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = { 
	{

		.num_items = 5,

		.items = {

			{ "Ext Mic", 0x0 },

			{ "Mic", 0x0 },

			{ "Line In", 0x2 },

			{ "CD", 0x4 },

			{ "Input Mix", 0xa },
@@ -2175,7 +2175,7 @@ static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = { 
	{

		.num_items = 4,

		.items = {

			{ "Ext Mic", 0x0 },

			{ "Mic", 0x0 },

			{ "Line In", 0x2 },

			{ "CD", 0x4 },

			{ "Input Mix", 0xa },
@@ -2841,8 +2841,8 @@ static struct snd_kcontrol_new alc880_fujitsu_mixer[] = { 
	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

	{ } /* end */
@@ -13247,7 +13247,7 @@ static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = { 
	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),

	{ }

};
@@ -16380,7 +16380,7 @@ static struct hda_input_mux alc861vd_capture_source = { 
static struct hda_input_mux alc861vd_dallas_capture_source = {

	.num_items = 2,

	.items = {

		{ "Ext Mic", 0x0 },

		{ "Mic", 0x0 },

		{ "Internal Mic", 0x1 },

	},

};
@@ -16522,16 +16522,16 @@ static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = { 
};















/* Pin assignment: Speaker=0x14, HP = 0x15,













 *                 Ext Mic=0x18, Internal Mic = 0x19, CD = 0x1c, PC Beep = 0x1d













 *                 Mic=0x18, Internal Mic = 0x19, CD = 0x1c, PC Beep = 0x1d















 */















static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {















	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),















	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),















	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),















	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),













	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),













	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),













	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),















	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),















	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),















	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),










@@ -18547,9 +18547,9 @@ static struct snd_kcontrol_new alc272_nc10_mixer[] = {













	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),















	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),



























	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),













	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),













	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),





























	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),















	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),