Changeset 87

Timestamp:

Jan 23, 2007, 10:49:43 PM (19 years ago)

Author:

vladest

Message:

Latest HDA patches from ALSA

Location:

GPL/trunk/alsa-kernel/pci/hda

Files:

• patch_analog.c (modified) (5 diffs)
• patch_sigmatel.c (modified) (9 diffs)

GPL/trunk/alsa-kernel/pci/hda/patch_analog.c

@@ -787 +787 @@
 };
 
+/* Ultra initialization */
+static struct hda_verb ad1986a_ultra_init[] = {
+        /* eapd initialization */
+        { 0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 },
+        /* CLFE -> Mic in */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2 },
+        { 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
+        { } /* end */
+};
+
 /* models */
 enum {
@@ -792 +803 @@
         AD1986A_3STACK,
         AD1986A_LAPTOP,
-        AD1986A_LAPTOP_EAPD,
+        AD1986A_LAPTOP_EAPD,
+        AD1986A_ULTRA,
         AD1986A_MODELS
 };
@@ -800 +812 @@
         [AD1986A_3STACK]        = "3stack",
         [AD1986A_LAPTOP]        = "laptop",
-        [AD1986A_LAPTOP_EAPD]   = "laptop-eapd",
+        [AD1986A_LAPTOP_EAPD]   = "laptop-eapd",
+        [AD1986A_ULTRA]         = "ultra",
 };
 
@@ -822 +835 @@
         SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),
+        SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
+        SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
         SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
         SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_EAPD),
@@ -888 +903 @@
                 spec->input_mux = &ad1986a_laptop_eapd_capture_source;
                 break;
+        case AD1986A_ULTRA:
+                spec->mixers[0] = ad1986a_laptop_eapd_mixers;
+                spec->num_init_verbs = 2;
+                spec->init_verbs[1] = ad1986a_ultra_init;
+                spec->multiout.max_channels = 2;
+                spec->multiout.num_dacs = 1;
+                spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
+                spec->multiout.dig_out_nid = 0;
+                break;
         }
 
-        return 0;
+        return 0;
 }
 

GPL/trunk/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -51 +51 @@
 
 enum {
+        STAC_925x_REF,
+        STAC_M2_2,
+        STAC_MA6,
+        STAC_925x_MODELS
+};
+
+enum {
         STAC_D945_REF,
         STAC_D945GTP3,
@@ -132 +139 @@
 };
 
+static hda_nid_t stac925x_adc_nids[1] = {
+        0x03,
+};
+
+static hda_nid_t stac925x_mux_nids[1] = {
+        0x0f,
+};
+
+static hda_nid_t stac925x_dac_nids[1] = {
+        0x02,
+};
+
 static hda_nid_t stac922x_adc_nids[2] = {
         0x06, 0x07,
@@ -163 +182 @@
         0x08, 0x09, 0x0d, 0x0e, 
         0x0f, 0x10, 0x11, 0x12,
+};
+
+static hda_nid_t stac925x_pin_nids[8] = {
+        0x07, 0x08, 0x0a, 0x0b,
+        0x0c, 0x0d, 0x10, 0x11,
 };
 
@@ -241 +265 @@
         /* set dac0mux for dac converter */
         { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0}
+};
+
+static struct hda_verb stac925x_core_init[] = {
+        /* set dac0mux for dac converter */
+        { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0}
 };
@@ -286 +316 @@
         HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Mux Volume", 0x0c, 0, HDA_OUTPUT),
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new stac925x_mixer[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0xe, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Master Playback Switch", 0xe, 0, HDA_OUTPUT),
+        {
+                .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", 0x09, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Mux Volume", 0x0f, 0, HDA_OUTPUT),
         {0} /* end */
 };
@@ -411 +458 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cb,
                       "Dell Latitude 120L", STAC_REF),
+        {0} /* terminator */
+};
+
+static unsigned int ref925x_pin_configs[8] = {
+        0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
+        0x90a70320, 0x02214210, 0x400003f1, 0x9033032e,
+};
+
+static unsigned int stac925x_MA6_pin_configs[8] = {
+        0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
+        0x90a70320, 0x90100211, 0x400003f1, 0x9033032e,
+};
+
+static unsigned int stac925xM2_2_pin_configs[8] = {
+        0x40c003f3, 0x424503f2, 0x041800f4, 0x02a19020,
+        0x50a103F0, 0x90100210, 0x400003f1, 0x9033032e,
+};
+
+static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
+        [STAC_REF] = ref925x_pin_configs,
+        [STAC_M2_2] = stac925xM2_2_pin_configs,
+        [STAC_MA6] = stac925x_MA6_pin_configs,
+};
+
+static const char *stac925x_models[STAC_925x_MODELS] = {
+        [STAC_REF] = "ref",
+        [STAC_M2_2] = "m2-2",
+        [STAC_MA6] = "m6",
+};
+
+static struct snd_pci_quirk stac925x_cfg_tbl[] = {
+        /* SigmaTel reference board */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),
+        SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_REF),
+        SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_REF),
+        SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_MA6),
+        SND_PCI_QUIRK(0x1002, 0x437b, "Gateway MX6453", STAC_M2_2),
         {0} /* terminator */
 };
@@ -1702 +1786 @@
 }
 
+static int patch_stac925x(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec;
+        int err;
+
+        spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+        spec->num_pins = 8;
+        spec->pin_nids = stac925x_pin_nids;
+        spec->board_config = snd_hda_check_board_config(codec, STAC_925x_MODELS,
+                                                        stac925x_models,
+                                                        stac925x_cfg_tbl);
+        if (spec->board_config < 0) {
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x, using BIOS defaults\n");
+                err = stac92xx_save_bios_config_regs(codec);
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else if (stac925x_brd_tbl[spec->board_config] != NULL){
+                spec->pin_configs = stac925x_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
+        }
+
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = 1;
+        spec->multiout.dac_nids = stac925x_dac_nids;
+        spec->adc_nids = stac925x_adc_nids;
+        spec->mux_nids = stac925x_mux_nids;
+        spec->num_muxes = 1;
+        spec->num_dmics = 0;
+
+        spec->init = stac925x_core_init;
+        spec->mixer = stac925x_mixer;
+
+        err = stac92xx_parse_auto_config(codec, 0x8, 0x7);
+        if (err < 0) {
+                stac92xx_free(codec);
+                return err;
+        }
+
+        codec->patch_ops = stac92xx_patch_ops;
+
+        return 0;
+}
+
 static int patch_stac922x(struct hda_codec *codec)
 {
@@ -1861 +1995 @@
 
         spec->multiout.dac_nids = spec->dac_nids;
+
+        /* Configure GPIO0 as EAPD output */
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_DIRECTION, 0x00000001);
+        /* Configure GPIO0 as CMOS */
+        snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0x00000000);
+        /* Assert GPIO0 high */
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_DATA, 0x00000001);
+        /* Enable GPIO0 */
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_MASK, 0x00000001);
 
         err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);
@@ -2139 +2285 @@
         { .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },
         { .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },
-        { .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
+        { .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
+        { .id = 0x83847632, .name = "STAC9202",  .patch = patch_stac925x },
+        { .id = 0x83847633, .name = "STAC9202D", .patch = patch_stac925x },
+        { .id = 0x83847634, .name = "STAC9250", .patch = patch_stac925x },
+        { .id = 0x83847635, .name = "STAC9250D", .patch = patch_stac925x },
+        { .id = 0x83847636, .name = "STAC9251", .patch = patch_stac925x },
+        { .id = 0x83847637, .name = "STAC9250D", .patch = patch_stac925x },
         /* The following does not take into account .id=0x83847661 when subsys =
          * 104D0C00 which is STAC9225s. Because of this, some SZ Notebooks are