korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ALSA] Add Intel D965 board support

Browse Source 
Added the support for Intel D965 boards with STAC9227 codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai 2006-06-28 15:52:16 +02:00 committed by Jaroslav Kysela
parent 9c7f852e8b
commit 19039bd007
1 changed files with 99 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
sound/pci/hda/patch_sigmatel.c
View File

@ -42,6 +42,9 @@
#define STAC_D945GTP3 1 #define STAC_D945GTP3 1
#define STAC_D945GTP5 2 #define STAC_D945GTP5 2
#define STAC_MACMINI 3 #define STAC_MACMINI 3
#define STAC_D965_2112 4
#define STAC_D965_284B 5
#define STAC_922X_MODELS 6 /* number of 922x models */
struct sigmatel_spec { struct sigmatel_spec {
struct snd_kcontrol_new *mixers[4]; struct snd_kcontrol_new *mixers[4];
@ -107,10 +110,24 @@ static hda_nid_t stac922x_adc_nids[2] = {
0x06, 0x07, 0x06, 0x07,
}; };
static hda_nid_t stac9227_adc_nids[2] = {
0x07, 0x08,
};
#if 0
static hda_nid_t d965_2112_dac_nids[3] = {
0x02, 0x03, 0x05,
};
#endif
static hda_nid_t stac922x_mux_nids[2] = { static hda_nid_t stac922x_mux_nids[2] = {
0x12, 0x13, 0x12, 0x13,
}; };
static hda_nid_t stac9227_mux_nids[2] = {
0x15, 0x16,
};
static hda_nid_t stac927x_adc_nids[3] = { static hda_nid_t stac927x_adc_nids[3] = {
0x07, 0x08, 0x09 0x07, 0x08, 0x09
}; };
@ -173,6 +190,24 @@ static struct hda_verb stac922x_core_init[] = {
{} {}
}; };
static struct hda_verb stac9227_core_init[] = {
/* set master volume and direct control */
{ 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
/* unmute node 0x1b */
{ 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
{}
};
static struct hda_verb d965_2112_core_init[] = {
/* set master volume and direct control */
{ 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
/* unmute node 0x1b */
{ 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
/* select node 0x03 as DAC */
{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},
{}
};
static struct hda_verb stac927x_core_init[] = { static struct hda_verb stac927x_core_init[] = {
/* set master volume and direct control */ /* set master volume and direct control */
{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
@ -212,6 +247,21 @@ static struct snd_kcontrol_new stac922x_mixer[] = {
{ } /* end */ { } /* end */
}; };
/* This needs to be generated dynamically based on sequence */
static struct snd_kcontrol_new stac9227_mixer[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Source",
.count = 1,
.info = stac92xx_mux_enum_info,
.get = stac92xx_mux_enum_get,
.put = stac92xx_mux_enum_put,
},
HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
{ } /* end */
};
static snd_kcontrol_new_t stac927x_mixer[] = { static snd_kcontrol_new_t stac927x_mixer[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@ -291,11 +341,17 @@ static unsigned int d945gtp5_pin_configs[10] = {
0x02a19320, 0x40000100, 0x02a19320, 0x40000100,
}; };
static unsigned int *stac922x_brd_tbl[] = { static unsigned int d965_2112_pin_configs[10] = {
ref922x_pin_configs, 0x0221401f, 0x40000100, 0x40000100, 0x01014011,
d945gtp3_pin_configs, 0x01a19021, 0x01813024, 0x01452130, 0x40000100,
d945gtp5_pin_configs, 0x02a19320, 0x40000100,
NULL, /* STAC_MACMINI */ };
static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
[STAC_REF] = ref922x_pin_configs,
[STAC_D945GTP3] = d945gtp3_pin_configs,
[STAC_D945GTP5] = d945gtp5_pin_configs,
[STAC_D965_2112] = d965_2112_pin_configs,
}; };
static struct hda_board_config stac922x_cfg_tbl[] = { static struct hda_board_config stac922x_cfg_tbl[] = {
@ -330,6 +386,12 @@ static struct hda_board_config stac922x_cfg_tbl[] = {
{ .pci_subvendor = 0x8384, { .pci_subvendor = 0x8384,
.pci_subdevice = 0x7680, .pci_subdevice = 0x7680,
.config = STAC_MACMINI }, /* Apple Mac Mini (early 2006) */ .config = STAC_MACMINI }, /* Apple Mac Mini (early 2006) */
{ .pci_subvendor = PCI_VENDOR_ID_INTEL,
.pci_subdevice = 0x2112,
.config = STAC_D965_2112 },
{ .pci_subvendor = PCI_VENDOR_ID_INTEL,
.pci_subdevice = 0x284b,
.config = STAC_D965_284B },
{} /* terminator */ {} /* terminator */
}; };
@ -713,7 +775,8 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
* A and B is not supported. * A and B is not supported.
*/ */
/* fill in the dac_nids table from the parsed pin configuration */ /* fill in the dac_nids table from the parsed pin configuration */
static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg) static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
const struct auto_pin_cfg *cfg)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
hda_nid_t nid; hda_nid_t nid;
@ -732,10 +795,13 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec, const struct aut
} }
/* add playback controls from the parsed DAC table */ /* add playback controls from the parsed DAC table */
static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec, const struct auto_pin_cfg *cfg) static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" }; static const char *chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side"
};
hda_nid_t nid; hda_nid_t nid;
int i, err; int i, err;
@ -893,10 +959,12 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
return err; return err;
if (! spec->autocfg.line_outs) if (! spec->autocfg.line_outs)
return 0; /* can't find valid pin config */ return 0; /* can't find valid pin config */
if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0) if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
return err; return err;
if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0) if (spec->multiout.num_dacs == 0)
return err; if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
return err;
if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 || if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
(err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg)) < 0 || (err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg)) < 0 ||
@ -1194,7 +1262,8 @@ static int patch_stac922x(struct hda_codec *codec)
codec->spec = spec; codec->spec = spec;
spec->board_config = snd_hda_check_board_config(codec, stac922x_cfg_tbl); spec->board_config = snd_hda_check_board_config(codec, stac922x_cfg_tbl);
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, "
"using BIOS defaults\n");
else if (stac922x_brd_tbl[spec->board_config] != NULL) { else if (stac922x_brd_tbl[spec->board_config] != NULL) {
spec->num_pins = 10; spec->num_pins = 10;
spec->pin_nids = stac922x_pin_nids; spec->pin_nids = stac922x_pin_nids;
@ -1210,6 +1279,25 @@ static int patch_stac922x(struct hda_codec *codec)
spec->mixer = stac922x_mixer; spec->mixer = stac922x_mixer;
spec->multiout.dac_nids = spec->dac_nids; spec->multiout.dac_nids = spec->dac_nids;
switch (spec->board_config) {
case STAC_D965_2112:
spec->adc_nids = stac9227_adc_nids;
spec->mux_nids = stac9227_mux_nids;
#if 0
spec->multiout.dac_nids = d965_2112_dac_nids;
spec->multiout.num_dacs = ARRAY_SIZE(d965_2112_dac_nids);
#endif
spec->init = d965_2112_core_init;
spec->mixer = stac9227_mixer;
break;
case STAC_D965_284B:
spec->adc_nids = stac9227_adc_nids;
spec->mux_nids = stac9227_mux_nids;
spec->init = stac9227_core_init;
spec->mixer = stac9227_mixer;
break;
}
err = stac92xx_parse_auto_config(codec, 0x08, 0x09); err = stac92xx_parse_auto_config(codec, 0x08, 0x09);
if (err < 0) { if (err < 0) {