View | Details | Raw Unified | Return to bug 156494
Collapse All | Expand All

(-)a/sound/pci/hda/patch_sigmatel.c (+94 lines)
Lines 1148-1153 Link Here
1148
}
1148
}
1149
1149
1150
/*
1150
/*
1151
 * STAC7661
1152
 */
1153
1154
static hda_nid_t vaio_dacs[4] = { 0x2, 0x3, 0x4, 0x5 };
1155
static hda_nid_t vaio_adcs[2] = { 0x8, 0x6 };
1156
1157
static struct hda_verb vaio_init[] = {
1158
	{0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP? <- 0x2 */
1159
	{0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* ?? <- 0x4 */
1160
	{0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* LO? <- 0x3 */
1161
	{0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
1162
	{0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
1163
	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* LO? <- 0x5 */
1164
	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
1165
	{0x15, AC_VERB_SET_CONNECT_SEL, 0x2}, /* 0a,0d,14,02 */
1166
	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
1167
	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
1168
	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
1169
	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
1170
	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
1171
	{}
1172
};
1173
1174
static struct snd_kcontrol_new vaio_mixer[] = {
1175
	HDA_CODEC_VOLUME("NODE-02 Playback Volume", 0x02, 0, HDA_OUTPUT),
1176
	HDA_CODEC_MUTE("NODE-02 Playback Switch", 0x02, 0, HDA_OUTPUT),
1177
	HDA_CODEC_VOLUME("NODE-03 Playback Volume", 0x03, 0, HDA_OUTPUT),
1178
	HDA_CODEC_MUTE("NODE-03 Playback Switch", 0x03, 0, HDA_OUTPUT),
1179
	HDA_CODEC_VOLUME("NODE-04 Playback Volume", 0x04, 0, HDA_OUTPUT),
1180
	HDA_CODEC_MUTE("NODE-04 Playback Switch", 0x04, 0, HDA_OUTPUT),
1181
	HDA_CODEC_VOLUME("NODE-05 Playback Volume", 0x05, 0, HDA_OUTPUT),
1182
	HDA_CODEC_MUTE("NODE-05 Playback Switch", 0x05, 0, HDA_OUTPUT),
1183
	HDA_CODEC_VOLUME("CD-In Capture Volume", 0x07, 0, HDA_INPUT),
1184
	HDA_CODEC_MUTE("CD-In Capture Switch", 0x07, 0, HDA_INPUT),
1185
	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
1186
	HDA_CODEC_VOLUME("Capture Switch", 0x09, 0, HDA_INPUT),
1187
	HDA_CODEC_VOLUME("Mic-In Capture Volume", 0x15, 0, HDA_INPUT),
1188
	HDA_CODEC_VOLUME("Mic-In Capture Switch", 0x15, 0, HDA_INPUT),
1189
	{}
1190
};
1191
1192
static struct hda_codec_ops stac7661_patch_ops = {
1193
	.build_controls = stac92xx_build_controls,
1194
	.build_pcms = stac92xx_build_pcms,
1195
	.init = stac92xx_init,
1196
	.free = stac92xx_free,
1197
	// .unsol_event = stac92xx_unsol_event,
1198
#ifdef CONFIG_PM
1199
	.resume = stac92xx_resume,
1200
#endif
1201
};
1202
1203
enum { STAC7661_VAIO };
1204
1205
static struct hda_board_config stac7661_cfg_tbl[] = {
1206
	{ .modelname = "vaio", .config = STAC7661_VAIO },
1207
	{ .pci_subvendor = 0x104d, .pci_subdevice = 0x81ef,
1208
	  .config = STAC7661_VAIO },
1209
	{}
1210
};
1211
1212
static int patch_stac7661(struct hda_codec *codec)
1213
{
1214
	struct sigmatel_spec *spec;
1215
	int board_config;
1216
1217
	board_config = snd_hda_check_board_config(codec, stac7661_cfg_tbl);
1218
	if (board_config < 0)
1219
		return snd_hda_parse_generic_codec(codec);
1220
	
1221
	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
1222
	if (spec == NULL)
1223
		return -ENOMEM;
1224
1225
	codec->spec = spec;
1226
	switch (board_config) {
1227
	case STAC7661_VAIO:
1228
		spec->mixer = vaio_mixer;
1229
		spec->init = vaio_init;
1230
		spec->multiout.max_channels = 2;
1231
		spec->multiout.num_dacs = 4;
1232
		spec->multiout.dac_nids = vaio_dacs;
1233
		spec->num_adcs = 2;
1234
		spec->adc_nids = vaio_adcs;
1235
		break;
1236
	}
1237
1238
	codec->patch_ops = stac7661_patch_ops;
1239
	return 0;
1240
}
1241
1242
1243
/*
1151
 * patch entries
1244
 * patch entries
1152
 */
1245
 */
1153
struct hda_codec_preset snd_hda_preset_sigmatel[] = {
1246
struct hda_codec_preset snd_hda_preset_sigmatel[] = {
Lines 1168-1172 Link Here
1168
 	{ .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },
1261
 	{ .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },
1169
 	{ .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },
1262
 	{ .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },
1170
 	{ .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
1263
 	{ .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
1264
 	{ .id = 0x83847661, .name = "STAC7661", .patch = patch_stac7661 },
1171
	{} /* terminator */
1265
	{} /* terminator */
1172
};
1266
};

Return to bug 156494