lkml.org 
[lkml]   [2009]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 22/71] ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
    2.6.30-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit b04add956616b6d89ff21da749b46ad2bd58ef32 upstream.

    The recent rewrite of the codec parser for STAC9872 caused a regression
    for some Sony VAIO models that don't give proper pin default configs
    by BIOS. Even using model=vaio doesn't work because the pin definitions
    are set after the pin overrides.

    This patch fixes the pin definitions in patch_stac9872() to be put
    in the right place before the pin overrides. Also the patch adds the
    new quirk entry for VAIO F/S to have the correct pin default configs.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/hda/patch_sigmatel.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/sound/pci/hda/patch_sigmatel.c
    +++ b/sound/pci/hda/patch_sigmatel.c
    @@ -5661,6 +5661,8 @@ static unsigned int *stac9872_brd_tbl[ST
    };

    static struct snd_pci_quirk stac9872_cfg_tbl[] = {
    + SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
    + "Sony VAIO F/S", STAC_9872_VAIO),
    {} /* terminator */
    };

    @@ -5673,6 +5675,8 @@ static int patch_stac9872(struct hda_cod
    if (spec == NULL)
    return -ENOMEM;
    codec->spec = spec;
    + spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
    + spec->pin_nids = stac9872_pin_nids;

    spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
    stac9872_models,
    @@ -5684,8 +5688,6 @@ static int patch_stac9872(struct hda_cod
    stac92xx_set_config_regs(codec,
    stac9872_brd_tbl[spec->board_config]);

    - spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
    - spec->pin_nids = stac9872_pin_nids;
    spec->multiout.dac_nids = spec->dac_nids;
    spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids);
    spec->adc_nids = stac9872_adc_nids;



    \
     
     \ /
      Last update: 2009-07-29 02:01    [W:4.092 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site