Skip to content

Commit

Permalink
ASoC: sta529: Fix update register bits in sta529_set_dai_fmt
Browse files Browse the repository at this point in the history
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>
Cc: stable@vger.kernel.org
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 20, 2012
1 parent 8246b5b commit ad1937c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions sound/soc/codecs/sta529.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -289,7 +290,7 @@ static int sta529_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
return -EINVAL;
}

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

return 0;
}
Expand Down

0 comments on commit ad1937c

Please sign in to comment.