Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ALSA: hda - Improve ASUS eeePC 1000 mixer
The mixer elements created for ASUS eeePC 1000 with ALC269 aren't
standard but strange words like "LineOut". Rename the element names
to follow the standard one like "Headphone" and "Speaker".
Also, split the volumes to each so that the virtual master can control
them.
The alc269_fujitsu_mixer is removed because it's now identical with
the new eeepc mixer.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+5
-19
sound/pci/hda/patch_realtek.c
+5
-19
sound/pci/hda/patch_realtek.c
···
12876
12876
{ }
12877
12877
};
12878
12878
12879
-
/* bind volumes of both NID 0x0c and 0x0d */
12880
-
static struct hda_bind_ctls alc269_epc_bind_vol = {
12881
-
.ops = &snd_hda_bind_vol,
12882
-
.values = {
12883
-
HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
12884
-
HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
12885
-
0
12886
-
},
12887
-
};
12888
-
12889
12879
static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
12890
-
HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
12891
-
HDA_BIND_VOL("LineOut Playback Volume", &alc269_epc_bind_vol),
12892
-
HDA_CODEC_MUTE("LineOut Playback Switch", 0x15, 0x0, HDA_OUTPUT),
12880
+
HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
12881
+
HDA_CODEC_MUTE("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
12882
+
HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
12883
+
HDA_CODEC_MUTE("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
12893
12884
{ } /* end */
12894
12885
};
12895
12886
···
12893
12902
};
12894
12903
12895
12904
/* FSC amilo */
12896
-
static struct snd_kcontrol_new alc269_fujitsu_mixer[] = {
12897
-
HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
12898
-
HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
12899
-
HDA_BIND_VOL("PCM Playback Volume", &alc269_epc_bind_vol),
12900
-
{ } /* end */
12901
-
};
12905
+
#define alc269_fujitsu_mixer alc269_eeepc_mixer
12902
12906
12903
12907
static struct hda_verb alc269_quanta_fl1_verbs[] = {
12904
12908
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},