lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 107/176] ASoC: Handle low measured DC offsets for wm_hubs devices
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit 20a4e7fc7e213365ea3771d7bf1e10a6bab853be upstream.

    The DC servo codes are actually signed numbers so need to be treated as
    such.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/soc/codecs/wm_hubs.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    --- a/sound/soc/codecs/wm_hubs.c
    +++ b/sound/soc/codecs/wm_hubs.c
    @@ -92,6 +92,7 @@ static void wait_for_dc_servo(struct snd
    static void calibrate_dc_servo(struct snd_soc_codec *codec)
    {
    struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
    + s8 offset;
    u16 reg, reg_l, reg_r, dcs_cfg;

    /* Set for 32 series updates */
    @@ -130,16 +131,14 @@ static void calibrate_dc_servo(struct sn
    dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);

    /* HPOUT1L */
    - if (reg_l + hubs->dcs_codes > 0 &&
    - reg_l + hubs->dcs_codes < 0xff)
    - reg_l += hubs->dcs_codes;
    - dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
    + offset = reg_l;
    + offset += hubs->dcs_codes;
    + dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;

    /* HPOUT1R */
    - if (reg_r + hubs->dcs_codes > 0 &&
    - reg_r + hubs->dcs_codes < 0xff)
    - reg_r += hubs->dcs_codes;
    - dcs_cfg |= reg_r;
    + offset = reg_r;
    + offset += hubs->dcs_codes;
    + dcs_cfg |= (u8)offset;

    dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);




    \
     
     \ /
      Last update: 2011-02-16 02:07    [W:4.033 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site