Attachment 72611 Details for Bug 156494

[patch] A new patch for VAIO with STAC7661

stac7661-fix2.diff (text/plain), 3.40 KB, created by Takashi Iwai on 2006-03-13 17:05:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2006-03-13 17:05:13 UTC

Size: 3.40 KB

patch

obsolete

>--- linux/sound/pci/hda/patch_sigmatel.c	15 Feb 2006 14:51:12 -0000	1.18
>+++ linux/sound/pci/hda/patch_sigmatel.c	13 Mar 2006 17:03:09 -0000
>@@ -1148,6 +1148,95 @@
> }
> 
> /*
>+ * STAC7661
>+ */
>+
>+static hda_nid_t vaio_dacs[4] = { 0x2, 0x3, 0x4, 0x5 };
>+static hda_nid_t vaio_adcs[2] = { 0x8, 0x6 };
>+
>+static struct hda_verb vaio_init[] = {
>+	{0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
>+	{0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* N/A <- 0x4 */
>+	{0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* N/A <- 0x3 */
>+	{0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
>+	{0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
>+	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x2}, /* 0a,0d,14,02 */
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{}
>+};
>+
>+static struct snd_kcontrol_new vaio_mixer[] = {
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("CD-In Capture Volume", 0x07, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD-In Capture Switch", 0x07, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic-In Capture Volume", 0x15, 0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Mic-In Capture Switch", 0x15, 0, HDA_OUTPUT),
>+	{}
>+};
>+
>+static struct hda_codec_ops stac7661_patch_ops = {
>+	.build_controls = stac92xx_build_controls,
>+	.build_pcms = stac92xx_build_pcms,
>+	.init = stac92xx_init,
>+	.free = stac92xx_free,
>+	// .unsol_event = stac92xx_unsol_event,
>+#ifdef CONFIG_PM
>+	.resume = stac92xx_resume,
>+#endif
>+};
>+
>+enum { STAC7661_VAIO };
>+
>+static struct hda_board_config stac7661_cfg_tbl[] = {
>+	{ .modelname = "vaio", .config = STAC7661_VAIO },
>+	{ .pci_subvendor = 0x104d, .pci_subdevice = 0x81ef,
>+	  .config = STAC7661_VAIO },
>+	{}
>+};
>+
>+static int patch_stac7661(struct hda_codec *codec)
>+{
>+	struct sigmatel_spec *spec;
>+	int board_config;
>+
>+	board_config = snd_hda_check_board_config(codec, stac7661_cfg_tbl);
>+	if (board_config < 0)
>+		return snd_hda_parse_generic_codec(codec);
>+	
>+	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+	switch (board_config) {
>+	case STAC7661_VAIO:
>+		spec->mixer = vaio_mixer;
>+		spec->init = vaio_init;
>+		spec->multiout.max_channels = 2;
>+		spec->multiout.num_dacs = 4;
>+		spec->multiout.dac_nids = vaio_dacs;
>+		spec->num_adcs = 2;
>+		spec->adc_nids = vaio_adcs;
>+		break;
>+	}
>+
>+	codec->patch_ops = stac7661_patch_ops;
>+	return 0;
>+}
>+
>+
>+/*
>  * patch entries
>  */
> struct hda_codec_preset snd_hda_preset_sigmatel[] = {
>@@ -1168,5 +1257,6 @@
>  	{ .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 },
> 	{} /* terminator */
> };

Actions: View | Diff

Attachments on bug 156494: 71996 | 71999 | 72000 | 72002 | 72240 | 72294 | 72603 | 72611 | 72617 | 72888