lkml.org 
[lkml]   [2013]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 24/62] ASoC: dapm: Use SND_SOC_DAPM_INIT_REG_VAL in SND_SOC_DAPM_MUX
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: Stephen Warren <swarren@nvidia.com>

    commit faf6615bf05bc5cecc6e22013b9cb21c77784fd1 upstream.

    SND_SOC_DAPM_MUX() doesn't currently initialize the .mask field. This
    results in the mux never affecting HW, since no bits are ever set or
    cleared. Fix SND_SOC_DAPM_MUX() to use SND_SOC_DAPM_INIT_REG_VAL() to
    set up the reg, shift, on_val, and off_val fields like almost all other
    SND_SOC_xxx() macros. It looks like this was a "typo" in the fixed
    commit linked below.

    This makes the speakers on the Toshiba AC100 (PAZ00) laptop work again.

    Fixes: de9ba98b6d26 ("ASoC: dapm: Make widget power register settings more flexible")
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Mark Brown <broonie@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/sound/soc-dapm.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/include/sound/soc-dapm.h
    +++ b/include/sound/soc-dapm.h
    @@ -104,7 +104,8 @@ struct device;
    SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
    .kcontrol_news = wcontrols, .num_kcontrols = 1}
    #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
    -{ .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \
    +{ .id = snd_soc_dapm_mux, .name = wname, \
    + SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
    .kcontrol_news = wcontrols, .num_kcontrols = 1}
    #define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
    { .id = snd_soc_dapm_virt_mux, .name = wname, \



    \
     
     \ /
      Last update: 2013-12-10 10:41    [W:4.052 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site