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

Commit 7d5ab418 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 23c4a881 798a8a15

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ STAC9227/9228/9229/927x 
  5stack-no-fp	D965 5stack without front panel

  dell-3stack	Dell Dimension E520

  dell-bios	Fixes with Dell BIOS setup

  volknob	Fixes with volume-knob widget 0x24

  auto		BIOS setup (default)



STAC92HD71B*

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2674,6 +2674,7 @@ static struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x10de, 0x044b), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x055c), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x055d), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0590), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0774), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0775), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0776), .driver_data = AZX_DRIVER_NVIDIA },

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
		      CXT5066_LAPTOP),

	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",

		      CXT5066_DELL_LAPTOP),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),

	{}

};

sound/pci/hda/patch_nvhdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "hda_local.h"



/* define below to restrict the supported rates and formats */

#define LIMITED_RATE_FMT_SUPPORT

/* #define LIMITED_RATE_FMT_SUPPORT */



struct nvhdmi_spec {

	struct hda_multi_out multiout;

sound/pci/hda/patch_realtek.c

+6 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ struct alc_spec { 
	struct snd_kcontrol_new *cap_mixer;	/* capture mixer */

	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */













	const struct hda_verb *init_verbs[5];	/* initialization verbs













	const struct hda_verb *init_verbs[10];	/* initialization verbs















						 * don't forget NULL















						 * termination!















						 */










@@ -965,6 +965,8 @@ static void alc_automute_pin(struct hda_codec *codec)













	unsigned int nid = spec->autocfg.hp_pins[0];















	int i;



























	if (!nid)













		return;















	pincap = snd_hda_query_pin_caps(codec, nid);















	if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */















		snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);










@@ -12594,7 +12596,8 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {













	SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",















						ALC268_ACER_ASPIRE_ONE),















	SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),













	SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),













	SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,













			"Dell Inspiron Mini9/Vostro A90", ALC268_DELL),















	/* almost compatible with toshiba but with optional digital outs;















	 * auto-probing seems working fine















	 */










@@ -17351,7 +17354,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,



























/* create playback/capture controls for input pins */















#define alc662_auto_create_input_ctls \













	alc880_auto_create_input_ctls













	alc882_auto_create_input_ctls





























static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,















					      hda_nid_t nid, int pin_type,