Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (a1d12511) · Commits · e / devices / android_kernel_teracube_mt6765

sound/pci/hda/patch_analog.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3835,9 +3835,11 @@ static struct hda_verb ad1884a_laptop_verbs[] = {
	/* Port-F (int speaker) mixer - route only from analog mixer */		/* Port-F (int speaker) mixer - route only from analog mixer */
	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},		{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},		{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
	/* Port-F pin */		/* Port-F (int speaker) pin */
	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},		{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},		{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
			/* required for compaq 6530s/6531s speaker output */
			{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
	/* Port-C pin - internal mic-in */		/* Port-C pin - internal mic-in */
	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},		{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */

sound/pci/hda/patch_realtek.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -12521,8 +12521,6 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
	ALC268_TOSHIBA),		ALC268_TOSHIBA),
	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),		SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
	SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),		SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
	SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
	ALC268_TOSHIBA),
	SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),		SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),
	SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),		SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
	SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),		SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),
	@@ -12530,6 +12528,15 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
	{}		{}
	};		};

			/* Toshiba laptops have no unique PCI SSID but only codec SSID */
			static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
			SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO),
			SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO),
			SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
			ALC268_TOSHIBA),
			{}
			};

	static struct alc_config_preset alc268_presets[] = {		static struct alc_config_preset alc268_presets[] = {
	[ALC267_QUANTA_IL1] = {		[ALC267_QUANTA_IL1] = {
	.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
	@@ -12696,6 +12703,10 @@ static int patch_alc268(struct hda_codec *codec)
	alc268_models,		alc268_models,
	alc268_cfg_tbl);		alc268_cfg_tbl);

			if (board_config < 0 \|\| board_config >= ALC268_MODEL_LAST)
			board_config = snd_hda_check_board_codec_sid_config(codec,
			ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);

	if (board_config < 0 \|\| board_config >= ALC268_MODEL_LAST) {		if (board_config < 0 \|\| board_config >= ALC268_MODEL_LAST) {
	printk(KERN_INFO "hda_codec: Unknown model for %s, "		printk(KERN_INFO "hda_codec: Unknown model for %s, "
	"trying auto-probe from BIOS...\n", codec->chip_name);		"trying auto-probe from BIOS...\n", codec->chip_name);

sound/pci/hda/patch_sigmatel.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -76,6 +76,7 @@ enum {
	STAC_92HD73XX_AUTO,		STAC_92HD73XX_AUTO,
	STAC_92HD73XX_NO_JD, /* no jack-detection */		STAC_92HD73XX_NO_JD, /* no jack-detection */
	STAC_92HD73XX_REF,		STAC_92HD73XX_REF,
			STAC_92HD73XX_INTEL,
	STAC_DELL_M6_AMIC,		STAC_DELL_M6_AMIC,
	STAC_DELL_M6_DMIC,		STAC_DELL_M6_DMIC,
	STAC_DELL_M6_BOTH,		STAC_DELL_M6_BOTH,
	@@ -1777,6 +1778,7 @@ static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
	[STAC_92HD73XX_AUTO] = "auto",		[STAC_92HD73XX_AUTO] = "auto",
	[STAC_92HD73XX_NO_JD] = "no-jd",		[STAC_92HD73XX_NO_JD] = "no-jd",
	[STAC_92HD73XX_REF] = "ref",		[STAC_92HD73XX_REF] = "ref",
			[STAC_92HD73XX_INTEL] = "intel",
	[STAC_DELL_M6_AMIC] = "dell-m6-amic",		[STAC_DELL_M6_AMIC] = "dell-m6-amic",
	[STAC_DELL_M6_DMIC] = "dell-m6-dmic",		[STAC_DELL_M6_DMIC] = "dell-m6-dmic",
	[STAC_DELL_M6_BOTH] = "dell-m6",		[STAC_DELL_M6_BOTH] = "dell-m6",
	@@ -1789,6 +1791,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
	"DFI LanParty", STAC_92HD73XX_REF),		"DFI LanParty", STAC_92HD73XX_REF),
	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,		SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
	"DFI LanParty", STAC_92HD73XX_REF),		"DFI LanParty", STAC_92HD73XX_REF),
			SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,
			"Intel DG45ID", STAC_92HD73XX_INTEL),
			SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,
			"Intel DG45FC", STAC_92HD73XX_INTEL),
	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,		SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
	"Dell Studio 1535", STAC_DELL_M6_DMIC),		"Dell Studio 1535", STAC_DELL_M6_DMIC),
	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,		SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,