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

Commit d4c06c70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Nothing existing here: as usual a few HD-audio fixes (device fixups, a
  new AMD PCI ID, and a fix for krealloc() usage), in addition to a fix
  in Kconfig for legacy arm drivers"

* tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix headset mic detection problem for two dell machines
  ALSA: hda: Fix krealloc() with __GFP_ZERO usage
  ALSA: hda: add AMD Bonaire AZ PCI ID with proper driver caps
  ALSA: arm: Fix empty menuconfig SND_ARM
  ALSA: hda - On-board speaker fixup on ACER Veriton
  ALSA: hda/realtek - Can't adjust speaker's volume on a Dell AIO
parents 2cfd716d 59ec4b57

sound/arm/Kconfig

+7 −8
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ menuconfig SND_ARM 
	  Drivers that are implemented on ASoC can be found in

	  "ALSA for SoC audio support" section.



config SND_PXA2XX_LIB

	tristate

	select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97

	select SND_DMAENGINE_PCM



config SND_PXA2XX_LIB_AC97

	bool



if SND_ARM



config SND_ARMAACI
@@ -42,3 +34,10 @@ config SND_PXA2XX_AC97 


endif	# SND_ARM



config SND_PXA2XX_LIB

	tristate

	select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97

	select SND_DMAENGINE_PCM



config SND_PXA2XX_LIB_AC97

	bool

sound/hda/array.c

+3 −1
Original line number Diff line number Diff line
@@ -21,13 +21,15 @@ void *snd_array_new(struct snd_array *array) 
		return NULL;

	if (array->used >= array->alloced) {

		int num = array->alloced + array->alloc_align;

		int oldsize = array->alloced * array->elem_size;

		int size = (num + 1) * array->elem_size;

		void *nlist;

		if (snd_BUG_ON(num >= 4096))

			return NULL;

		nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO);

		nlist = krealloc(array->list, size, GFP_KERNEL);

		if (!nlist)

			return NULL;

		memset(nlist + oldsize, 0, size - oldsize);

		array->list = nlist;

		array->alloced = num;

	}

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2265,6 +2265,8 @@ static const struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x1022, 0x780d),

	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },

	/* ATI HDMI */

	{ PCI_DEVICE(0x1002, 0x0002),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },

	{ PCI_DEVICE(0x1002, 0x1308),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },

	{ PCI_DEVICE(0x1002, 0x157a),

sound/pci/hda/patch_realtek.c

+37 −0
Original line number Diff line number Diff line
@@ -4689,6 +4689,22 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, 
	}

}



static void alc298_fixup_speaker_volume(struct hda_codec *codec,

					const struct hda_fixup *fix, int action)

{

	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		/* The speaker is routed to the Node 0x06 by a mistake, as a result

		   we can't adjust the speaker's volume since this node does not has

		   Amp-out capability. we change the speaker's route to:

		   Node 0x02 (Audio Output) -> Node 0x0c (Audio Mixer) -> Node 0x17 (

		   Pin Complex), since Node 0x02 has Amp-out caps, we can adjust

		   speaker's volume now. */



		hda_nid_t conn1[1] = { 0x0c };

		snd_hda_override_conn_list(codec, 0x17, 1, conn1);

	}

}



/* Hook to update amp GPIO4 for automute */

static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec,

					  struct hda_jack_callback *jack)
@@ -4838,6 +4854,7 @@ enum { 
	ALC280_FIXUP_HP_HEADSET_MIC,

	ALC221_FIXUP_HP_FRONT_MIC,

	ALC292_FIXUP_TPT460,

	ALC298_FIXUP_SPK_VOLUME,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -5493,6 +5510,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE,

	},

	[ALC298_FIXUP_SPK_VOLUME] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc298_fixup_speaker_volume,

		.chained = true,

		.chain_id = ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5539,6 +5562,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13 9350", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),

	SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -5813,6 +5837,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x14, 0x90170130},

		{0x1b, 0x01014020},

		{0x21, 0x0221103f}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x14, 0x90170130},

		{0x1b, 0x02011020},

		{0x21, 0x0221103f}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x14, 0x90170150},

		{0x1b, 0x02011020},
@@ -6549,6 +6577,7 @@ enum { 
	ALC668_FIXUP_ASUS_Nx51,

	ALC891_FIXUP_HEADSET_MODE,

	ALC891_FIXUP_DELL_MIC_NO_PRESENCE,

	ALC662_FIXUP_ACER_VERITON,

};



static const struct hda_fixup alc662_fixups[] = {
@@ -6818,6 +6847,13 @@ static const struct hda_fixup alc662_fixups[] = { 
		.chained = true,

		.chain_id = ALC891_FIXUP_HEADSET_MODE

	},

	[ALC662_FIXUP_ACER_VERITON] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x15, 0x50170120 }, /* no internal speaker */

			{ }

		}

	},

};



static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -6856,6 +6892,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x19da, 0xa130, "Zotac Z68", ALC662_FIXUP_ZOTAC_Z68),

	SND_PCI_QUIRK(0x1b0a, 0x01b8, "ACER Veriton", ALC662_FIXUP_ACER_VERITON),

	SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),



#if 0