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

Commit a1984f49 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 901d46d5 145a902b

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," 
			 "{Intel, ICH10},"

			 "{Intel, PCH},"

			 "{Intel, CPT},"

			 "{Intel, PBG},"

			 "{Intel, SCH},"

			 "{ATI, SB450},"

			 "{ATI, SB600},"
@@ -2749,6 +2750,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	{ PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },

	/* CPT */

	{ PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },

	/* PBG */

	{ PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },

	/* SCH */

	{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },

	/* ATI SB 450/600 */

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -3092,6 +3092,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),

	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),

	SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),

sound/pci/hda/patch_nvhdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static struct hda_verb nvhdmi_basic_init_7x[] = { 
#else

/* support all rates and formats */

#define SUPPORTED_RATES \

	(SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\

	(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\

	SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\

	 SNDRV_PCM_RATE_192000)

#define SUPPORTED_MAXBPS	24

sound/pci/hda/patch_realtek.c

+10 −0
Original line number Diff line number Diff line
@@ -14453,6 +14453,7 @@ static void alc269_auto_init(struct hda_codec *codec) 














enum {















	ALC269_FIXUP_SONY_VAIO,













	ALC269_FIXUP_DELL_M101Z,















};





























static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {









@@ -14464,11 +14465,20 @@ static const struct alc_fixup alc269_fixups[] = {













	[ALC269_FIXUP_SONY_VAIO] = {















		.verbs = alc269_sony_vaio_fixup_verbs















	},













	[ALC269_FIXUP_DELL_M101Z] = {













		.verbs = (const struct hda_verb[]) {













			/* Enables internal speaker */













			{0x20, AC_VERB_SET_COEF_INDEX, 13},













			{0x20, AC_VERB_SET_PROC_COEF, 0x4040},













			{}













		}













	},















};





























static struct snd_pci_quirk alc269_fixup_tbl[] = {















	SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),















	SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),













	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),















	{}















};