hda: Added more 92HD71 codecs
PATCH 1/1 hda: Added more 92HD71 codecs
Added more codecs to the 92HD71 family, as well as support for several that don't have an analog mixer.
---
Signed-off-by Matthew Ranostay <[email protected]>
pci/hda/patch_sigmatel.c +64 -8
@@ -532,9 +532,24 @@ static struct hda_verb stac92hd71bxx_cor { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},/* connect headphone jack to dac1 */ { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, + { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */ +/* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */ + { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, +/* unmute mono out node */ + { 0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, +}; + +static struct hda_verb stac92hd71bxx_analog_core_init[] = { +/* set master volume and direct control */ + {0x28 ,AC_VERB_SET_VOLUME_KNOB_CONTROL ,0xff }, +/* connect headphone jack to dac1 */ + {0x0a ,AC_VERB_SET_CONNECT_SEL ,0x01 },/* connect ports 0d and 0f to audio mixer */ {0x0d ,AC_VERB_SET_CONNECT_SEL ,0x2 }, {0x0f ,AC_VERB_SET_CONNECT_SEL ,0x2 }, + {0x0f ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT },/* unmute dac0 input in audio mixer */ {0x17 ,AC_VERB_SET_AMP_GAIN_MUTE ,0x701f }, /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
@@ -714,9 +729,31 @@ static struct snd_kcontrol_new stac92hd7 { }/* end */ }; +static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { +STAC_DIGITAL_INPUT_SOURCE (1 ), +STAC_INPUT_SOURCE (2 ), + +/* hardware gain controls */ +HDA_CODEC_VOLUME_IDX ("Digital Mic Volume" ,0x0 ,0x18 ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_VOLUME_IDX ("Digital Mic Volume" ,0x1 ,0x19 ,0x0 ,HDA_OUTPUT ), + +HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x0 ,0x1a ,0x0 ,HDA_OUTPUT ), + +HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ), +HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x1 ,0x1b ,0x0 ,HDA_OUTPUT ), + +HDA_CODEC_MUTE ("Analog Loopback 1" ,0x17 ,0x3 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Analog Loopback 2" ,0x17 ,0x4 ,HDA_INPUT ), + { }/* end */ +}; +static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {STAC_DIGITAL_INPUT_SOURCE (1 ),STAC_INPUT_SOURCE (2 ), +STAC_ANALOG_LOOPBACK (0xFA0 ,0x7A0 ,2 ),/* hardware gain controls */ HDA_CODEC_VOLUME_IDX ("Digital Mic Volume" ,0x0 ,0x18 ,0x0 ,HDA_OUTPUT ),
@@ -729,9 +766,6 @@ static struct snd_kcontrol_new stac92hd7HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ), HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT), - -HDA_CODEC_MUTE ("Analog Loopback 1" ,0x17 ,0x3 ,HDA_INPUT ), - HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT), { } /* end */ };
@@ -3088,11 +3122,24 @@ again:stac92xx_set_config_regs (codec); } +switch (codec->vendor_id) { +case 0x111d76b6 :/* 4 Port without Analog Mixer */ +case 0x111d76b7 : +case 0x111d76b4 :/* 6 Port without Analog Mixer */ +case 0x111d76b5 : + spec->mixer = stac92hd71bxx_mixer; + spec->init = stac92hd71bxx_core_init; +break ; +default : + spec->mixer = stac92hd71bxx_analog_mixer; + spec->init = stac92hd71bxx_analog_core_init; + } + + spec->aloopback_mask =0x20 ; + spec->aloopback_shift =0 ; + spec->gpio_mask = spec->gpio_data =0x00000001 ;/* GPIO0 High = EAPD */ stac92xx_enable_gpio_mask (codec); - - spec->init = stac92hd71bxx_core_init; - spec->mixer = stac92hd71bxx_mixer; spec->mux_nids = stac92hd71bxx_mux_nids; spec->adc_nids = stac92hd71bxx_adc_nids;
@@ -3702,8 +3749,17 @@ struct hda_codec_preset snd_hda_preset_s { .id = 0x838476a5, .name = "STAC9255D", .patch = patch_stac9205 }, { .id = 0x838476a6, .name = "STAC9254", .patch = patch_stac9205 }, { .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 }, + { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, + { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx }, { .id = 0x111d7676, .name = "92HD73E1X5", .patch = patch_stac92hd73xx }, - { .id = 0x111d7675, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, - { .id = 0x111d76b0, .name = "92HD71BXX", .patch = patch_stac92hd71bxx }, + { .id = 0x111d7608, .name = "92HD71BXX", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b0, .name = "92HD71B8X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b1, .name = "92HD71B8X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b2, .name = "92HD71B7X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b3, .name = "92HD71B7X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b4, .name = "92HD71B6X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b5, .name = "92HD71B6X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b6, .name = "92HD71B5X", .patch = patch_stac92hd71bxx }, + { .id = 0x111d76b7, .name = "92HD71B5X", .patch = patch_stac92hd71bxx }, {} /* terminator */ };
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Takashi Iwai
AppliedAt Thu, 13 Dec 2007 14:25:43 -0500,
Quoted 5 lines · Matthew Ranostay
Added more codecs to the 92HD71 family, as well as support for several that don't have an analog mixer.
---Signed-off-by Matthew Ranostay <[email protected]>
Applied both patches to HG tree. Thanks.
Takashi