summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/alc269_quirks.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-16 14:30:50 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-16 14:30:50 +0200
commit46e11ac7947a5be763acf711194b2b3371799441 (patch)
treec0302d925e50857e893dfe6cc69a203926b1bc90 /sound/pci/hda/alc269_quirks.c
parent497979262f9e812be1d64e597ec1bbbf92c8eba3 (diff)
downloadtalos-op-linux-46e11ac7947a5be763acf711194b2b3371799441.tar.gz
talos-op-linux-46e11ac7947a5be763acf711194b2b3371799441.zip
ALSA: hda - Remove acer, acer-aspire and acer-dmic models for ALC268
Moved some code to alc269_quirks.c for dependency, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/alc269_quirks.c')
-rw-r--r--sound/pci/hda/alc269_quirks.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/pci/hda/alc269_quirks.c b/sound/pci/hda/alc269_quirks.c
index 5ac0e2162a46..080b7e43f37b 100644
--- a/sound/pci/hda/alc269_quirks.c
+++ b/sound/pci/hda/alc269_quirks.c
@@ -62,6 +62,20 @@ static const struct snd_kcontrol_new alc269_base_mixer[] = {
{ } /* end */
};
+/* Acer specific */
+/* bind volumes of both NID 0x02 and 0x03 */
+static const struct hda_bind_ctls alc268_acer_bind_master_vol = {
+ .ops = &snd_hda_bind_vol,
+ .values = {
+ HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+ HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
+ 0
+ },
+};
+
+#define alc268_acer_master_sw_get alc262_hp_master_sw_get
+#define alc268_acer_master_sw_put alc262_hp_master_sw_put
+
static const struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
/* output mixer control */
HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
OpenPOWER on IntegriCloud