[PATCH] [UBUNTU:sound/pci/hda/] Fix inaudible sound on Sony VAIO AR 11B

[crimsun at fungus.sh.nu]

From 7600b5cafdd81417a8e52c48fcc3cacad23ebcf2 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Thu, 17 Aug 2006 01:38:05 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] Fix inaudible sound on Sony VAIO AR 11B

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
		a12116d225f2 [http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=a12116d225f2c8a599129ac29d398c42bf902ef2;style=raw]

This commit generalises the STAC7661 infrastructure into STAC766x for
patch_sigmatel.c , which is needed to fix Ubuntu bugs #33719 and
.#56576.

Suitable for application to Dapper and Edgy linux-source.

Signed-off-by: Guillaume Munch <diabo at free.fr>
Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/hda/patch_sigmatel.c |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 43cb89f..72ab2e0 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1349,10 +1349,10 @@ static int patch_stac927x(struct hda_cod
 }
 
 /*
- * STAC7661
+ * STAC 7661(?) and 7664 hack
  */
 
-/* static config for Sony VAIO FE550G */
+/* static config for Sony VAIO FE550G and Sony VAIO AR */
 static hda_nid_t vaio_dacs[1] = { 0x2 };
 #define VAIO_HP_DAC	0x5
 static hda_nid_t vaio_adcs[2] = { 0x8, 0x6 };
@@ -1452,7 +1452,7 @@ static snd_kcontrol_new_t vaio_mixer[] =
 	{}
 };
 
-static struct hda_codec_ops stac7661_patch_ops = {
+static struct hda_codec_ops stac766x_patch_ops = {
 	.build_controls = stac92xx_build_controls,
 	.build_pcms = stac92xx_build_pcms,
 	.init = stac92xx_init,
@@ -1462,21 +1462,25 @@ #ifdef CONFIG_PM
 #endif
 };
 
-enum { STAC7661_VAIO };
+enum { STAC766x_VAIO };
 
-static struct hda_board_config stac7661_cfg_tbl[] = {
-	{ .modelname = "vaio", .config = STAC7661_VAIO },
+static struct hda_board_config stac766x_cfg_tbl[] = {
+	{ .modelname = "vaio", .config = STAC766x_VAIO },
+	{ .pci_subvendor = 0x104d, .pci_subdevice = 0x81e6,
+	  .config = STAC766x_VAIO },
 	{ .pci_subvendor = 0x104d, .pci_subdevice = 0x81ef,
-	  .config = STAC7661_VAIO },
+	  .config = STAC766x_VAIO },
+	{ .pci_subvendor = 0x104d, .pci_subdevice = 0x81fd,
+	  .config = STAC766x_VAIO },
 	{}
 };
 
-static int patch_stac7661(struct hda_codec *codec)
+static int patch_stac766x(struct hda_codec *codec)
 {
 	struct sigmatel_spec *spec;
 	int board_config;
 
-	board_config = snd_hda_check_board_config(codec, stac7661_cfg_tbl);
+	board_config = snd_hda_check_board_config(codec, stac766x_cfg_tbl);
 	if (board_config < 0)
 		/* unknown config, let generic-parser do its job... */
 		return snd_hda_parse_generic_codec(codec);
@@ -1487,7 +1491,7 @@ static int patch_stac7661(struct hda_cod
 
 	codec->spec = spec;
 	switch (board_config) {
-	case STAC7661_VAIO:
+	case STAC766x_VAIO:
 		spec->mixer = vaio_mixer;
 		spec->init = vaio_init;
 		spec->multiout.max_channels = 2;
@@ -1501,7 +1505,7 @@ static int patch_stac7661(struct hda_cod
 		break;
 	}
 
-	codec->patch_ops = stac7661_patch_ops;
+	codec->patch_ops = stac766x_patch_ops;
 	return 0;
 }
 
@@ -1533,6 +1537,7 @@ struct hda_codec_preset snd_hda_preset_s
 	{ .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },
 	{ .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },
 	{ .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
-	{ .id = 0x83847661, .name = "STAC7661", .patch = patch_stac7661 },
+	{ .id = 0x83847661, .name = "STAC7661", .patch = patch_stac766x },
+	{ .id = 0x83847664, .name = "STAC7664", .patch = patch_stac766x },
 	{} /* terminator */
 };
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060816/2250eda5/attachment.sig>