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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  eukrea-tlv320: fix platform_name
  ASoC: correct pxa AC97 DAI names
  ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs
  ALSA: HDA: Add ideapad quirk for two Dell machines
  ALSA: HDA: Add a new Conexant codec 506e (20590)
  ALSA: usb-audio: fix oops due to cleanup race when disconnecting
  ASoC: Hook wm_hubs micbiases up to CLK_SYS
  ASoC: Correct definition of WM8903_VMID_RES_5K
  ASoC: Fix WM8958 default microphone detection argument ordering
  ALSA: HDA: Fix mic initialization in VIA auto parser
  ALSA: fix one memory leak in sound jack
parents fbd71844 11be6a26

sound/core/jack.c

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 


fail_input:

	input_free_device(jack->input_dev);

	kfree(jack->id);

	kfree(jack);

	return err;

}

sound/pci/hda/patch_conexant.c

+5 −0
Original line number Diff line number Diff line
@@ -3114,6 +3114,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0401, "Dell Vostro 1014", CXT5066_DELL_VOSTRO),

	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),

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

	SND_PCI_QUIRK(0x1028, 0x050f, "Dell Inspiron", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1028, 0x0510, "Dell Vostro", CXT5066_IDEAPAD),

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

	SND_PCI_QUIRK(0x1043, 0x13f3, "Asus A52J", CXT5066_ASUS),

	SND_PCI_QUIRK(0x1043, 0x1643, "Asus K52JU", CXT5066_ASUS),
@@ -3937,6 +3939,8 @@ static struct hda_codec_preset snd_hda_preset_conexant[] = { 
	  .patch = patch_cxt5066 },

	{ .id = 0x14f15069, .name = "CX20585",

	  .patch = patch_cxt5066 },

	{ .id = 0x14f1506e, .name = "CX20590",

	  .patch = patch_cxt5066 },

	{ .id = 0x14f15097, .name = "CX20631",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f15098, .name = "CX20632",
@@ -3963,6 +3967,7 @@ MODULE_ALIAS("snd-hda-codec-id:14f15066"); 
MODULE_ALIAS("snd-hda-codec-id:14f15067");

MODULE_ALIAS("snd-hda-codec-id:14f15068");

MODULE_ALIAS("snd-hda-codec-id:14f15069");

MODULE_ALIAS("snd-hda-codec-id:14f1506e");

MODULE_ALIAS("snd-hda-codec-id:14f15097");

MODULE_ALIAS("snd-hda-codec-id:14f15098");

MODULE_ALIAS("snd-hda-codec-id:14f150a1");

sound/pci/hda/patch_sigmatel.c

+12 −3
Original line number Diff line number Diff line
@@ -586,7 +586,12 @@ static hda_nid_t stac92hd83xxx_pin_nids[10] = { 
	0x0f, 0x10, 0x11, 0x1f, 0x20,

};



static hda_nid_t stac92hd88xxx_pin_nids[10] = {

static hda_nid_t stac92hd87xxx_pin_nids[6] = {

	0x0a, 0x0b, 0x0c, 0x0d,

	0x0f, 0x11,

};



static hda_nid_t stac92hd88xxx_pin_nids[8] = {

	0x0a, 0x0b, 0x0c, 0x0d,

	0x0f, 0x11, 0x1f, 0x20,

};
@@ -5430,12 +5435,13 @@ again: 
	switch (codec->vendor_id) {

	case 0x111d76d1:

	case 0x111d76d9:

	case 0x111d76e5:

		spec->dmic_nids = stac92hd87b_dmic_nids;

		spec->num_dmics = stac92xx_connected_ports(codec,

				stac92hd87b_dmic_nids,

				STAC92HD87B_NUM_DMICS);

		spec->num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids);

		spec->pin_nids = stac92hd88xxx_pin_nids;

		spec->num_pins = ARRAY_SIZE(stac92hd87xxx_pin_nids);

		spec->pin_nids = stac92hd87xxx_pin_nids;

		spec->mono_nid = 0;

		spec->num_pwrs = 0;

		break;
@@ -5443,6 +5449,7 @@ again: 
	case 0x111d7667:

	case 0x111d7668:

	case 0x111d7669:

	case 0x111d76e3:

		spec->num_dmics = stac92xx_connected_ports(codec,

				stac92hd88xxx_dmic_nids,

				STAC92HD88XXX_NUM_DMICS);
@@ -6387,6 +6394,8 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = { 
	{ .id = 0x111d76cd, .name = "92HD89F2", .patch = patch_stac92hd73xx },

	{ .id = 0x111d76ce, .name = "92HD89F1", .patch = patch_stac92hd73xx },

	{ .id = 0x111d76e0, .name = "92HD91BXX", .patch = patch_stac92hd83xxx},

	{ .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx},

	{ .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx},

	{ .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx},

	{} /* terminator */

};

sound/pci/hda/patch_via.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void via_auto_init_analog_input(struct hda_codec *codec) 
		hda_nid_t nid = cfg->inputs[i].pin;

		if (spec->smart51_enabled && is_smart51_pins(spec, nid))

			ctl = PIN_OUT;

		else if (i == AUTO_PIN_MIC)

		else if (cfg->inputs[i].type == AUTO_PIN_MIC)

			ctl = PIN_VREF50;

		else

			ctl = PIN_IN;

sound/soc/codecs/wm8903.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, 


#define WM8903_VMID_RES_50K                          2

#define WM8903_VMID_RES_250K                         3

#define WM8903_VMID_RES_5K                           4

#define WM8903_VMID_RES_5K                           6



/*

 * R8 (0x08) - Analogue DAC 0

CRA Git | Maintained and supported by SUSTech CRA and CCSE