lkml.org 
[lkml]   [2011]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/17] ASoC/MFD: twl6040: Combine bit definitions for Headset control registers
    Date
    Use one set of defines for the HS bits, since they are identical in both
    control register.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    ---
    include/linux/mfd/twl6040.h | 11 +++--------
    sound/soc/codecs/twl6040.c | 2 +-
    2 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
    index 47470ca..d9e05ea 100644
    --- a/include/linux/mfd/twl6040.h
    +++ b/include/linux/mfd/twl6040.h
    @@ -120,15 +120,10 @@
    #define TWL6040_LPLLFIN 0x08
    #define TWL6040_HPLLSEL 0x10

    -/* HSLCTL (0x10) fields */
    +/* HSLCTL/R (0x10/0x11) fields */

    -#define TWL6040_HSDACMODEL 0x02
    -#define TWL6040_HSDRVMODEL 0x08
    -
    -/* HSRCTL (0x11) fields */
    -
    -#define TWL6040_HSDACMODER 0x02
    -#define TWL6040_HSDRVMODER 0x08
    +#define TWL6040_HSDACMODE (1 << 1)
    +#define TWL6040_HSDRVMODE (1 << 3)

    /* VIBCTLL (0x18) fields */

    diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
    index 1be8d1b..abde625 100644
    --- a/sound/soc/codecs/twl6040.c
    +++ b/sound/soc/codecs/twl6040.c
    @@ -638,7 +638,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
    static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
    {
    int hslctl, hsrctl;
    - int mask = TWL6040_HSDRVMODEL | TWL6040_HSDACMODEL;
    + int mask = TWL6040_HSDRVMODE | TWL6040_HSDACMODE;

    hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
    hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
    --
    1.7.6.1


    \
     
     \ /
      Last update: 2011-09-15 14:45    [W:0.040 / U:122.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site