lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 129/221] ASoC: sta529: Fix update register bits in sta529_set_dai_fmt
    Date
    3.7-stable review patch.  If anyone has any objections, please let me know.

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

    From: Axel Lin <axel.lin@ingics.com>

    commit ad1937cdd59c412097ec2bb8f38c12a5640f1f9a upstream.

    Both the mask and mode settings are wrong in current code.

    According to the datasheet:

    S2PCFG0 (0x0A)
    BIT[3:1] DATA_FORMAT
    serial interface protocol format:
    000: left Justified
    001: I2S (default)
    010: right justified
    100: PCM no delay
    101: PCM delay
    111: DSP

    Thus fixes the defines for LEFT_J_DATA_FORMAT, I2S_DATA_FORMAT, and
    RIGHT_J_DATA_FORMAT.
    Also adds define for DATA_FORMAT_MSK.

    Signed-off-by: Axel Lin <axel.lin@ingics.com>
    Acked-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/codecs/sta529.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/sound/soc/codecs/sta529.c
    +++ b/sound/soc/codecs/sta529.c
    @@ -74,9 +74,10 @@
    SNDRV_PCM_FMTBIT_S32_LE)
    #define S2PC_VALUE 0x98
    #define CLOCK_OUT 0x60
    -#define LEFT_J_DATA_FORMAT 0x10
    -#define I2S_DATA_FORMAT 0x12
    -#define RIGHT_J_DATA_FORMAT 0x14
    +#define DATA_FORMAT_MSK 0x0E
    +#define LEFT_J_DATA_FORMAT 0x00
    +#define I2S_DATA_FORMAT 0x02
    +#define RIGHT_J_DATA_FORMAT 0x04
    #define CODEC_MUTE_VAL 0x80

    #define POWER_CNTLMSAK 0x40
    @@ -289,7 +290,7 @@ static int sta529_set_dai_fmt(struct snd
    return -EINVAL;
    }

    - snd_soc_update_bits(codec, STA529_S2PCFG0, 0x0D, mode);
    + snd_soc_update_bits(codec, STA529_S2PCFG0, DATA_FORMAT_MSK, mode);

    return 0;
    }



    \
     
     \ /
      Last update: 2013-01-16 02:21    [W:4.041 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site