diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:22 +0000 |
| commit | a883eae5135ead2e1adafdd86635dd7d12f211d0 (patch) | |
| tree | d6a31c4a75e81e3e49b3f5a50ccd290e5638c03a /sound | |
| parent | fd2eab87a2fcf0f42e21df85a2a4cd18b30f813e (diff) | |
| parent | ad1937cdd59c412097ec2bb8f38c12a5640f1f9a (diff) | |
| download | linux-3.10-a883eae5135ead2e1adafdd86635dd7d12f211d0.tar.gz linux-3.10-a883eae5135ead2e1adafdd86635dd7d12f211d0.tar.bz2 linux-3.10-a883eae5135ead2e1adafdd86635dd7d12f211d0.zip | |
Merge remote-tracking branch 'asoc/fix/sta529' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sta529.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c index ab355c4f0b2..40c07be9b58 100644 --- 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_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; } |