lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 052/241] ALSA: HDA: Fix digital microphone on CS420x
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Daniel J Blueman <daniel@quora.org>

    commit 16337e028a6dae9fbdd718c0d42161540a668ff3 upstream.

    Correctly enable the digital microphones with the right bits in the
    right coeffecient registers on Cirrus CS4206/7 codecs. It also
    prevents misconfiguring ADC1/2.

    This fixes the digital mic on the Macbook Pro 10,1/Retina.

    Based-on-patch-by: Alexander Stein <alexander.stein@systec-electronic.com>
    Signed-off-by: Daniel J Blueman <daniel@quora.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    [ herton: unfuzz patch ]
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    sound/pci/hda/patch_cirrus.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
    index d31497f..f61c6c3 100644
    --- a/sound/pci/hda/patch_cirrus.c
    +++ b/sound/pci/hda/patch_cirrus.c
    @@ -96,8 +96,8 @@ enum {
    #define CS420X_VENDOR_NID 0x11
    #define CS_DIG_OUT1_PIN_NID 0x10
    #define CS_DIG_OUT2_PIN_NID 0x15
    -#define CS_DMIC1_PIN_NID 0x12
    -#define CS_DMIC2_PIN_NID 0x0e
    +#define CS_DMIC1_PIN_NID 0x0e
    +#define CS_DMIC2_PIN_NID 0x12

    /* coef indices */
    #define IDX_SPDIF_STAT 0x0000
    @@ -1074,14 +1074,18 @@ static void init_input(struct hda_codec *codec)
    cs_automic(codec);

    coef = 0x000a; /* ADC1/2 - Digital and Analog Soft Ramp */
    + cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
    +
    + coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG);
    if (is_active_pin(codec, CS_DMIC2_PIN_NID))
    - coef |= 0x0500; /* DMIC2 2 chan on, GPIO1 off */
    + coef |= 1 << 4; /* DMIC2 2 chan on, GPIO1 off */
    if (is_active_pin(codec, CS_DMIC1_PIN_NID))
    - coef |= 0x1800; /* DMIC1 2 chan on, GPIO0 off
    + coef |= 1 << 3; /* DMIC1 2 chan on, GPIO0 off
    * No effect if SPDIF_OUT2 is
    * selected in IDX_SPDIF_CTL.
    */
    - cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
    +
    + cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef);
    } else {
    if (spec->mic_detect)
    cs_automic(codec);
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 16:21    [W:4.157 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site