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

Commit 91baa2c7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Get rid of left-over chunks by previous cleanups



Also update the model description, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9fbbc94f
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ ALC662/663/272

ALC680
======
  base		Base model (ASUS NX90)
  auto		auto-config reading BIOS (default)
  N/A

ALC882/883/885/888/889
======================
@@ -163,10 +162,6 @@ ALC861VD/660VD
  6stack-dig	6-jack with SPDIF OUT
  3stack-660	3-jack (for ALC660VD)
  3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
  lenovo	Lenovo 3000 C200
  dallas	Dallas laptops
  hp		HP TX1000
  asus-v1s	ASUS V1Sn
  auto		auto-config reading BIOS (default)

CMI9880
+0 −26
Original line number Diff line number Diff line
@@ -159,27 +159,6 @@ static const struct snd_kcontrol_new alc861vd_3st_mixer[] = {
	{ } /* end */
};

static const struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
	/*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/
	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),

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

	HDA_CODEC_VOLUME("Mic Boost Volume", 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("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

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

	{ } /* end */
};

/*
 * generic initialization of ADC, input mixers and output mixers
 */
@@ -305,11 +284,6 @@ static const struct hda_verb alc861vd_6stack_init_verbs[] = {
	{ }
};

static const struct hda_verb alc861vd_eapd_verbs[] = {
	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
	{ }
};

/*
 * configuration and preset
 */