lkml.org 
[lkml]   [2012]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 06/70] ALSA: hda - add dock support for Thinkpad X230 Tablet
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Henningsson <david.henningsson@canonical.com>

    commit 108cc108a3bb42fe4705df1317ff98e1e29428a6 upstream.

    Also add a model/fixup string "lenovo-dock", so that other Thinkpad
    users will be able to test this fixup easily, to see if it enables
    dock I/O for them as well.

    BugLink: https://bugs.launchpad.net/bugs/1026953
    Tested-by: John McCarron <john.mccarron@canonical.com>
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    Documentation/sound/alsa/HD-Audio-Models.txt | 3 ++-
    sound/pci/hda/patch_realtek.c | 27 ++++++++++++++++++++++++++
    2 files changed, 29 insertions(+), 1 deletion(-)

    diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
    index edad99a..69820b2 100644
    --- a/Documentation/sound/alsa/HD-Audio-Models.txt
    +++ b/Documentation/sound/alsa/HD-Audio-Models.txt
    @@ -60,10 +60,11 @@ ALC267/268
    ==========
    N/A

    -ALC269
    +ALC269/270/275/276/280/282
    ======
    laptop-amic Laptops with analog-mic input
    laptop-dmic Laptops with digital-mic input
    + lenovo-dock Enables docking station I/O for some Lenovos

    ALC662/663/272
    ==============
    diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
    index 5f096a5..0f7fd50 100644
    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -4809,6 +4809,15 @@ static int alc269_resume(struct hda_codec *codec)
    }
    #endif /* CONFIG_PM */

    +static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
    + const struct alc_fixup *fix, int action)
    +{
    + struct alc_spec *spec = codec->spec;
    +
    + if (action == ALC_FIXUP_ACT_PRE_PROBE)
    + spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
    +}
    +
    static void alc269_fixup_hweq(struct hda_codec *codec,
    const struct alc_fixup *fix, int action)
    {
    @@ -4909,6 +4918,8 @@ enum {
    ALC269_FIXUP_DMIC,
    ALC269VB_FIXUP_AMIC,
    ALC269VB_FIXUP_DMIC,
    + ALC269_FIXUP_LENOVO_DOCK,
    + ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
    };

    static const struct alc_fixup alc269_fixups[] = {
    @@ -5029,6 +5040,20 @@ static const struct alc_fixup alc269_fixups[] = {
    { }
    },
    },
    + [ALC269_FIXUP_LENOVO_DOCK] = {
    + .type = ALC_FIXUP_PINS,
    + .v.pins = (const struct alc_pincfg[]) {
    + { 0x19, 0x23a11040 }, /* dock mic */
    + { 0x1b, 0x2121103f }, /* dock headphone */
    + { }
    + },
    + .chained = true,
    + .chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT
    + },
    + [ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {
    + .type = ALC_FIXUP_FUNC,
    + .v.func = alc269_fixup_pincfg_no_hp_to_lineout,
    + },
    };

    static const struct snd_pci_quirk alc269_fixup_tbl[] = {
    @@ -5051,6 +5076,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
    SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
    SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
    SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
    + SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
    SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE),
    SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K),
    SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
    @@ -5109,6 +5135,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
    static const struct alc_model_fixup alc269_fixup_models[] = {
    {.id = ALC269_FIXUP_AMIC, .name = "laptop-amic"},
    {.id = ALC269_FIXUP_DMIC, .name = "laptop-dmic"},
    + {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
    {}
    };





    \
     
     \ /
      Last update: 2012-08-07 06:43    [W:0.028 / U:0.364 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site